From 0961ece9896e20e7d81c86e41e99b0b536c0f738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 13 Dec 2015 03:56:29 +0100 Subject: [PATCH] make test-parameters optional --- test/test_extractors.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/test_extractors.py b/test/test_extractors.py index eb4438f2..63b7f3f4 100644 --- a/test/test_extractors.py +++ b/test/test_extractors.py @@ -8,12 +8,12 @@ # published by the Free Software Foundation. import unittest -import gallery_dl.extractor as extractor -import gallery_dl.jobs as jobs +from gallery_dl import extractor, jobs, config class TestExttractors(unittest.TestCase): def test_extractors(self): + config.load() for extr in extractor.extractors(): if not hasattr(extr, "test"): continue @@ -25,8 +25,10 @@ class TestExttractors(unittest.TestCase): def run_test(self, url, result): hjob = jobs.HashJob(url) hjob.run() - self.assertEqual(hjob.hash_url.hexdigest(), result["url"]) - self.assertEqual(hjob.hash_keyword.hexdigest(), result["keyword"]) + if "url" in result: + self.assertEqual(hjob.hash_url.hexdigest(), result["url"]) + if "keyword" in result: + self.assertEqual(hjob.hash_keyword.hexdigest(), result["keyword"]) if __name__ == '__main__': unittest.main(warnings='ignore')