From 692d015627ecf03fbc23cfdb4afcf398b9a09a51 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 12 Jan 2012 17:26:28 +0100 Subject: scripts for testing and syntax unit test --- tests/HosterPluginTester.py | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/HosterPluginTester.py (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py new file mode 100644 index 000000000..faaaf799c --- /dev/null +++ b/tests/HosterPluginTester.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + + -- cgit v1.2.3 From c7ad1cc5b4a5d190a060e3ddd9274c3065da6708 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 13 Jan 2012 23:24:21 +0100 Subject: plugin unit test, closed #499, #500 --- tests/HosterPluginTester.py | 115 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index faaaf799c..e4738ad5e 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -1,3 +1,118 @@ # -*- coding: utf-8 -*- +from os import remove +from os.path import dirname +from logging import log, DEBUG +from hashlib import md5 +from time import time +from nose.tools import nottest + +from helper.Stubs import Core +from helper.PluginTester import PluginTester + +from module.PyFile import PyFile +from module.plugins.Base import Fail +from module.utils import accumulate +from module.utils.fs import save_join, join, exists + +DL_DIR = join("Downloads", "tmp") + +class HosterPluginTester(PluginTester): + + files = {} + + def setUp(self): + PluginTester.setUp(self) + for f in self.files: + pass + if exists(join(DL_DIR, f)): remove(join(DL_DIR, f)) + + @nottest + 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) + + # url and plugin should be only important thing + pyfile = PyFile(self.core, -1, url, url, 0, 0, "", name, 0, 0) + pyfile.initPlugin() + + self.thread.pyfile = pyfile + self.thread.plugin = pyfile.plugin + + try: + a = time() + pyfile.plugin.preprocessing(self.thread) + + + log(DEBUG, "downloading took %ds" % (time()-a)) + log(DEBUG, "size %d kb" % (pyfile.size / 1024)) + + if pyfile.name not in self.files: + raise Exception("Filename %s wrong." % pyfile.name) + + if not exists(save_join(DL_DIR, pyfile.name)): + raise Exception("File %s does not exists." % pyfile.name) + + hash = md5() + f = open(save_join(DL_DIR, pyfile.name)) + while True: + buf = f.read(4096) + if not buf: break + hash.update(buf) + + if hash.hexdigest() != self.files[pyfile.name]: + raise Exception("Hash does not match.") + + + + except Exception, e: + if isinstance(e, Fail) and flag == "fail": + pass + elif isinstance(e, Fail) and flag == "offline" and e.message == "offline": + pass + else: + raise + + +# setup methods + +c = Core() + +f = open(join(dirname(__file__), "hosterlinks.txt")) +links = [x.strip() for x in f.readlines()] +urls = [] +flags = {} + +for l in links: + if not l or l.startswith("#"): continue + if l.startswith("http"): + if "||" in l: + l, flag = l.split("||") + flags[l] = flag + urls.append(l) + + elif len(l.split(" ")) == 2: + name, hash = l.split(" ") + HosterPluginTester.files[name] = hash + + +hoster, c = c.pluginManager.parseUrls(urls) + +plugins = accumulate(hoster) +for plugin, urls in plugins.iteritems(): + + for i, url in enumerate(urls): + + + def meta(plugin, url, flag, sig): + def _test(self): + self.test_plugin(plugin, url, flag) + + _test.func_name = sig + return _test + + sig = "test_%s_LINK%d" % (plugin, i) + setattr(HosterPluginTester, sig, meta(plugin, url, flags.get(url, None), sig)) \ No newline at end of file -- cgit v1.2.3 From 069503da5106fd2fcf7fa2d3a8462ab109b44adb Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 13 Jan 2012 23:42:10 +0100 Subject: cosmetic fixes --- tests/HosterPluginTester.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/HosterPluginTester.py') 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 -- cgit v1.2.3 From 828cc89cc9b7a2ecacf98fc73928d988e15f0b98 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 14 Jan 2012 15:49:08 +0100 Subject: captcha and attachments for plugin tester --- tests/HosterPluginTester.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index eeb895295..2972e28fe 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -28,6 +28,7 @@ class HosterPluginTester(PluginTester): pass if exists(join(DL_DIR, f)): remove(join(DL_DIR, f)) + @nottest def test_plugin(self, name, url, flag): @@ -46,10 +47,13 @@ class HosterPluginTester(PluginTester): a = time() pyfile.plugin.preprocessing(self.thread) - log(DEBUG, "downloading took %ds" % (time()-a)) log(DEBUG, "size %d kb" % (pyfile.size / 1024)) + if flag == "offline": + raise Exception("No offline Exception raised.") + + if pyfile.name not in self.files: raise Exception("Filename %s not recognized." % pyfile.name) @@ -64,6 +68,7 @@ class HosterPluginTester(PluginTester): hash.update(buf) if hash.hexdigest() != self.files[pyfile.name]: + log(DEBUG, "Hash is %s" % hash.hexdigest()) raise Exception("Hash does not match.") @@ -91,7 +96,7 @@ for l in links: if l.startswith("http"): if "||" in l: l, flag = l.split("||") - flags[l] = flag + flags[l] = flag.strip() urls.append(l) elif len(l.split(" ")) == 2: @@ -106,7 +111,6 @@ for plugin, urls in plugins.iteritems(): for i, url in enumerate(urls): - def meta(plugin, url, flag, sig): def _test(self): self.test_plugin(plugin, url, flag) @@ -114,5 +118,11 @@ for plugin, urls in plugins.iteritems(): _test.func_name = sig return _test - sig = "test_%s_LINK%d_%s" % (plugin, i, flag) + tmp_flag = flags.get(url, None) + if flags.get(url, None): + sig = "test_%s_LINK%d_%s" % (plugin, i, tmp_flag) + else: + sig = "test_%s_LINK%d" % (plugin, i) + + setattr(HosterPluginTester, sig, meta(plugin, url, flags.get(url, None), sig)) \ No newline at end of file -- cgit v1.2.3 From be3abec5255e91bbeb0484053302f95156ad7621 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Sun, 15 Jan 2012 01:10:21 +0100 Subject: plugin tester links --- tests/HosterPluginTester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 2972e28fe..32b67d93e 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -99,8 +99,8 @@ for l in links: flags[l] = flag.strip() urls.append(l) - elif len(l.split(" ")) == 2: - name, hash = l.split(" ") + elif len(l.rsplit(" ", 1)) == 2: + name, hash = l.rsplit(" ", 1) HosterPluginTester.files[name] = hash -- cgit v1.2.3 From 26227cfe53f8fd4bc1631d8e1b35031f589682dc Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 15 Jan 2012 15:55:19 +0100 Subject: backend + api test case, nicer format for plugin tester --- tests/HosterPluginTester.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 32b67d93e..bc802ec18 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +import __main__ + from os import remove from os.path import dirname from logging import log, DEBUG @@ -19,7 +21,6 @@ from module.utils.fs import save_join, join, exists DL_DIR = join("Downloads", "tmp") class HosterPluginTester(PluginTester): - files = {} def setUp(self): @@ -31,7 +32,6 @@ class HosterPluginTester(PluginTester): @nottest def test_plugin(self, name, url, flag): - # Print to stdout to see whats going on print "%s: %s, %s" % (name, url, flag) log(DEBUG, "%s: %s, %s", name, url, flag) @@ -47,13 +47,12 @@ class HosterPluginTester(PluginTester): a = time() pyfile.plugin.preprocessing(self.thread) - log(DEBUG, "downloading took %ds" % (time()-a)) + log(DEBUG, "downloading took %ds" % (time() - a)) log(DEBUG, "size %d kb" % (pyfile.size / 1024)) if flag == "offline": raise Exception("No offline Exception raised.") - if pyfile.name not in self.files: raise Exception("Filename %s not recognized." % pyfile.name) @@ -103,26 +102,38 @@ for l in links: name, hash = l.rsplit(" ", 1) HosterPluginTester.files[name] = hash - hoster, c = c.pluginManager.parseUrls(urls) plugins = accumulate(hoster) for plugin, urls in plugins.iteritems(): + # closure functions to retain local scope + def meta_class(plugin): + class _testerClass(HosterPluginTester): + pass + _testerClass.__name__ = plugin + return _testerClass - for i, url in enumerate(urls): + _testerClass = meta_class(plugin) - def meta(plugin, url, flag, sig): + for i, url in enumerate(urls): + def meta(__plugin, url, flag, sig): def _test(self): - self.test_plugin(plugin, url, flag) + self.test_plugin(__plugin, url, flag) _test.func_name = sig return _test tmp_flag = flags.get(url, None) if flags.get(url, None): - sig = "test_%s_LINK%d_%s" % (plugin, i, tmp_flag) + sig = "test_LINK%d_%s" % (i, tmp_flag) else: - sig = "test_%s_LINK%d" % (plugin, i) + sig = "test_LINK%d" % i + + # set test method + setattr(_testerClass, sig, meta(plugin, url, tmp_flag, sig)) - setattr(HosterPluginTester, sig, meta(plugin, url, flags.get(url, None), sig)) \ No newline at end of file + #register class + locals()[plugin] = _testerClass + # remove from locals, or tested twice + del _testerClass \ No newline at end of file -- cgit v1.2.3 From 5981d85ce8ee86ac03afb129511aff5498b08b37 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 15 Jan 2012 19:47:04 +0100 Subject: keep downloaded files for debug report --- tests/HosterPluginTester.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index bc802ec18..f9ca74e5f 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- -import __main__ - from os import remove from os.path import dirname from logging import log, DEBUG from hashlib import md5 from time import time +from shutil import move from nose.tools import nottest @@ -16,7 +15,7 @@ from helper.PluginTester import PluginTester from module.PyFile import PyFile from module.plugins.Base import Fail from module.utils import accumulate -from module.utils.fs import save_join, join, exists +from module.utils.fs import save_join, join, exists, listdir DL_DIR = join("Downloads", "tmp") @@ -29,6 +28,12 @@ class HosterPluginTester(PluginTester): pass if exists(join(DL_DIR, f)): remove(join(DL_DIR, f)) + # folder for reports + report = join("tmp", self.__class__.__name__) + if exists(report): + for f in listdir(report): + remove(join(report, f)) + @nottest def test_plugin(self, name, url, flag): @@ -65,9 +70,14 @@ class HosterPluginTester(PluginTester): buf = f.read(4096) if not buf: break hash.update(buf) + f.close() if hash.hexdigest() != self.files[pyfile.name]: log(DEBUG, "Hash is %s" % hash.hexdigest()) + + # Copy for debug report + move(f.name, join("tmp", plugin, f.name)) + raise Exception("Hash does not match.") -- cgit v1.2.3 From 20c318d1a95fe5dd33ca179c6a9e7787ab0c7e24 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Mon, 16 Jan 2012 20:51:02 +0100 Subject: hosterlinks.txt - little fix --- tests/HosterPluginTester.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index f9ca74e5f..23e9507f1 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -6,6 +6,7 @@ from logging import log, DEBUG from hashlib import md5 from time import time from shutil import move +import codecs from nose.tools import nottest @@ -95,7 +96,7 @@ class HosterPluginTester(PluginTester): c = Core() -f = open(join(dirname(__file__), "hosterlinks.txt")) +f = codecs.open(join(dirname(__file__), "hosterlinks.txt"), "r", "utf_8") links = [x.strip() for x in f.readlines()] urls = [] flags = {} -- cgit v1.2.3 From 00ea635a0528619c0ff2f09e8781418f4207504e Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 16 Jan 2012 21:07:09 +0100 Subject: unicode fix --- tests/HosterPluginTester.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 23e9507f1..2dd674367 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -96,6 +96,7 @@ class HosterPluginTester(PluginTester): c = Core() +# decode everything as unicode f = codecs.open(join(dirname(__file__), "hosterlinks.txt"), "r", "utf_8") links = [x.strip() for x in f.readlines()] urls = [] @@ -106,12 +107,12 @@ for l in links: if l.startswith("http"): if "||" in l: l, flag = l.split("||") - flags[l] = flag.strip() + flags[l] = str(flag.strip()) urls.append(l) elif len(l.rsplit(" ", 1)) == 2: name, hash = l.rsplit(" ", 1) - HosterPluginTester.files[name] = hash + HosterPluginTester.files[name] = str(hash) hoster, c = c.pluginManager.parseUrls(urls) @@ -147,4 +148,4 @@ for plugin, urls in plugins.iteritems(): #register class locals()[plugin] = _testerClass # remove from locals, or tested twice - del _testerClass \ No newline at end of file + del _testerClass -- cgit v1.2.3 From 7db6de72f2446d8ead6714f25b5e814cb7585b5a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 16 Jan 2012 21:12:01 +0100 Subject: encoding fix --- tests/HosterPluginTester.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 2dd674367..8e18c3eb9 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from os import remove from os.path import dirname from logging import log, DEBUG from hashlib import md5 @@ -16,7 +15,7 @@ from helper.PluginTester import PluginTester from module.PyFile import PyFile from module.plugins.Base import Fail from module.utils import accumulate -from module.utils.fs import save_join, join, exists, listdir +from module.utils.fs import save_join, join, exists, listdir, remove DL_DIR = join("Downloads", "tmp") @@ -26,8 +25,7 @@ class HosterPluginTester(PluginTester): def setUp(self): PluginTester.setUp(self) for f in self.files: - pass - if exists(join(DL_DIR, f)): remove(join(DL_DIR, f)) + if exists(save_join(DL_DIR, f)): remove(save_join(DL_DIR, f)) # folder for reports report = join("tmp", self.__class__.__name__) -- cgit v1.2.3 From ad2f10b53b5f832c00a4d62b2e655c3268793001 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 16 Jan 2012 21:32:09 +0100 Subject: add os.stat before moveing dl --- tests/HosterPluginTester.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 8e18c3eb9..f4d2c4dc4 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -15,7 +15,7 @@ from helper.PluginTester import PluginTester from module.PyFile import PyFile from module.plugins.Base import Fail from module.utils import accumulate -from module.utils.fs import save_join, join, exists, listdir, remove +from module.utils.fs import save_join, join, exists, listdir, remove, stat DL_DIR = join("Downloads", "tmp") @@ -73,9 +73,11 @@ class HosterPluginTester(PluginTester): if hash.hexdigest() != self.files[pyfile.name]: log(DEBUG, "Hash is %s" % hash.hexdigest()) - - # Copy for debug report - move(f.name, join("tmp", plugin, f.name)) + + size = stat(f.name).st_size + if size < 1024 * 1024 * 10: # 10MB + # Copy for debug report + move(f.name, join("tmp", plugin, f.name)) raise Exception("Hash does not match.") -- cgit v1.2.3 From efc86bbe3e6a97193f061c79f036b9997cadc678 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 16 Jan 2012 21:41:22 +0100 Subject: last fs encoding fix for today --- tests/HosterPluginTester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index f4d2c4dc4..b985c6687 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -15,7 +15,7 @@ from helper.PluginTester import PluginTester from module.PyFile import PyFile from module.plugins.Base import Fail from module.utils import accumulate -from module.utils.fs import save_join, join, exists, listdir, remove, stat +from module.utils.fs import save_join, join, exists, listdir, remove, stat, fs_encode DL_DIR = join("Downloads", "tmp") @@ -77,7 +77,7 @@ class HosterPluginTester(PluginTester): size = stat(f.name).st_size if size < 1024 * 1024 * 10: # 10MB # Copy for debug report - move(f.name, join("tmp", plugin, f.name)) + move(fs_encode(f.name), fs_encode(join("tmp", plugin, f.name))) raise Exception("Hash does not match.") -- cgit v1.2.3 From 3de98e43da6bc9bcf323ab258a0c1d0d046009e3 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Mon, 16 Jan 2012 23:28:47 +0100 Subject: hosterlinks - fix md5 hash --- tests/HosterPluginTester.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index b985c6687..ad71be0d2 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -64,7 +64,7 @@ class HosterPluginTester(PluginTester): raise Exception("File %s does not exists." % pyfile.name) hash = md5() - f = open(save_join(DL_DIR, pyfile.name)) + f = open(save_join(DL_DIR, pyfile.name), "rb") while True: buf = f.read(4096) if not buf: break -- cgit v1.2.3 From 8b0fafe9dee3bdf60b8cf8639b14c6a06366e029 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 20 Jan 2012 15:26:24 +0100 Subject: plugintester fix --- tests/HosterPluginTester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index ad71be0d2..f8a400c6d 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -37,8 +37,8 @@ class HosterPluginTester(PluginTester): @nottest def test_plugin(self, name, url, flag): # Print to stdout to see whats going on - print "%s: %s, %s" % (name, url, flag) - log(DEBUG, "%s: %s, %s", name, url, flag) + print "%s: %s, %s" % (name, url.encode("utf8"), flag) + log(DEBUG, "%s: %s, %s", name, url.encode("utf8"), flag) # url and plugin should be only important thing pyfile = PyFile(self.core, -1, url, url, 0, 0, "", name, 0, 0) -- cgit v1.2.3 From 88fde2ec4ac9f2501ed78e5c994c861c8159af31 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 5 Feb 2012 23:04:43 +0100 Subject: fix in hoster tester --- tests/HosterPluginTester.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index f8a400c6d..8299e362a 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -77,7 +77,8 @@ class HosterPluginTester(PluginTester): size = stat(f.name).st_size if size < 1024 * 1024 * 10: # 10MB # Copy for debug report - move(fs_encode(f.name), fs_encode(join("tmp", plugin, f.name))) + log(DEBUG, "Downloaded file copied to report") + move(f.name, join("tmp", plugin, f.name)) raise Exception("Hash does not match.") -- cgit v1.2.3 From 0d2d6daef850ac6bcc7fafccd230e52d2a862c2c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 3 Jun 2012 17:45:10 +0200 Subject: updates for database + api --- tests/HosterPluginTester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/HosterPluginTester.py') diff --git a/tests/HosterPluginTester.py b/tests/HosterPluginTester.py index 8299e362a..627494a3f 100644 --- a/tests/HosterPluginTester.py +++ b/tests/HosterPluginTester.py @@ -12,10 +12,10 @@ from nose.tools import nottest from helper.Stubs import Core from helper.PluginTester import PluginTester -from module.PyFile import PyFile +from module.datatypes.PyFile import PyFile from module.plugins.Base import Fail from module.utils import accumulate -from module.utils.fs import save_join, join, exists, listdir, remove, stat, fs_encode +from module.utils.fs import save_join, join, exists, listdir, remove, stat DL_DIR = join("Downloads", "tmp") -- cgit v1.2.3