diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-01-13 23:42:10 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-01-13 23:42:10 +0100 |
| commit | 069503da5106fd2fcf7fa2d3a8462ab109b44adb (patch) | |
| tree | 98a047626e68602e5c5da283012f91b6c5b76a91 | |
| parent | plugin unit test, closed #499, #500 (diff) | |
| download | pyload-069503da5106fd2fcf7fa2d3a8462ab109b44adb.tar.xz | |
cosmetic fixes
| -rw-r--r-- | tests/HosterPluginTester.py | 8 | ||||
| -rw-r--r-- | tests/helper/PluginTester.py | 3 | ||||
| -rwxr-xr-x | tests/hosterlinks.txt | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index e4738ad5e..eeb895295 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -32,8 +32,8 @@ class HosterPluginTester(PluginTester): def test_plugin(self, name, url, flag): # Print to stdout to see whats going on - print "%s: %s" % (name, url) - log(DEBUG, "%s: %s", name, url) + print "%s: %s, %s" % (name, url, flag) + log(DEBUG, "%s: %s, %s", name, url, flag) # url and plugin should be only important thing pyfile = PyFile(self.core, -1, url, url, 0, 0, "", name, 0, 0) @@ -51,7 +51,7 @@ class HosterPluginTester(PluginTester): log(DEBUG, "size %d kb" % (pyfile.size / 1024)) if pyfile.name not in self.files: - raise Exception("Filename %s wrong." % pyfile.name) + raise Exception("Filename %s not recognized." % pyfile.name) if not exists(save_join(DL_DIR, pyfile.name)): raise Exception("File %s does not exists." % pyfile.name) @@ -114,5 +114,5 @@ for plugin, urls in plugins.iteritems(): _test.func_name = sig return _test - sig = "test_%s_LINK%d" % (plugin, i) + sig = "test_%s_LINK%d_%s" % (plugin, i, flag) setattr(HosterPluginTester, sig, meta(plugin, url, flags.get(url, None), sig))
\ No newline at end of file diff --git a/tests/helper/PluginTester.py b/tests/helper/PluginTester.py index 997a0923f..d0c1cdd3c 100644 --- a/tests/helper/PluginTester.py +++ b/tests/helper/PluginTester.py @@ -7,6 +7,7 @@ from logging import log, DEBUG from time import sleep, time from Stubs import Thread, Core, noop +from sys import stderr from module.plugins.Hoster import Hoster, Abort, Fail @@ -49,4 +50,4 @@ class PluginTester(TestCase): debug = self.thread.writeDebugReport() log(DEBUG, debug) # generate attachment - print "\n[[ATTACHMENT|%s]]\n" % abspath(debug)
\ No newline at end of file + stderr.write("\n[[ATTACHMENT|%s]]\n" % abspath(debug))
\ No newline at end of file diff --git a/tests/hosterlinks.txt b/tests/hosterlinks.txt index 0da4074dc..153252626 100755 --- a/tests/hosterlinks.txt +++ b/tests/hosterlinks.txt @@ -9,7 +9,6 @@ http://netload.in/datei9XirAJZs79/random.bin.htm http://ul.to/file/o41isx||offline http://rapidshare.com/files/445996776/random.bin http://dl.free.fr/d4aL5dyXY||offline -http://www.duckload.com/dl/QggW2 http://files.mail.ru/32EW66||offline http://www.fileserve.com/file/MxjZXjX||offline http://www.4shared.com/file/-O5CBhQV/random.html |