New upstream version 1.10.2upstream/1.10.2

1 files changed, 9 insertions, 8 deletions

diff --git a/test/test_results.py b/test/test_results.py
index 839a75c..12f2416 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -26,12 +26,9 @@ TRAVIS_SKIP = {
 
 # temporary issues, etc.
 BROKEN = {
-    "adultempire",
-    "flickr",
+    "8chan",
     "imgth",
-    "mangafox",
     "mangapark",
-    "pixnet",
 }
 
 
@@ -90,13 +87,17 @@ class TestExtractorResults(unittest.TestCase):
         # test archive-id uniqueness
         self.assertEqual(len(set(tjob.list_archive)), len(tjob.list_archive))
 
-        # test '_extractor' entries
         if tjob.queue:
+            # test '_extractor' entries
             for url, kwdict in zip(tjob.list_url, tjob.list_keyword):
                 if "_extractor" in kwdict:
                     extr = kwdict["_extractor"].from_url(url)
                     self.assertIsInstance(extr, kwdict["_extractor"])
                     self.assertEqual(extr.url, url)
+        else:
+            # test 'extension' entries
+            for kwdict in tjob.list_keyword:
+                self.assertIn("extension", kwdict)
 
         # test extraction results
         if "url" in result:
@@ -168,7 +169,6 @@ class ResultJob(job.DownloadJob):
 
         if content:
             self.fileobj = TestPathfmt(self.hash_content)
-            self.get_downloader("http").check_extension = lambda a, b: None
 
         self.format_directory = TestFormatter(
             "".join(self.extractor.directory_fmt))
@@ -222,8 +222,8 @@ class TestPathfmt():
         self.hashobj = hashobj
         self.path = ""
         self.size = 0
-        self.keywords = {}
-        self.has_extension = True
+        self.kwdict = {}
+        self.extension = "jpg"
 
     def __enter__(self):
         return self
@@ -280,6 +280,7 @@ def setup_test_config():
     config.clear()
     config.set(("cache", "file"), ":memory:")
     config.set(("downloader", "part"), False)
+    config.set(("downloader", "adjust-extensions"), False)
     config.set(("extractor", "timeout"), 60)
     config.set(("extractor", "username"), name)
     config.set(("extractor", "password"), name)