New upstream version 1.12.1upstream/1.12.1

1 files changed, 42 insertions, 35 deletions

diff --git a/test/test_results.py b/test/test_results.py
index 6d628c3..869ff83 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -26,10 +26,9 @@ TRAVIS_SKIP = {
 
 # temporary issues, etc.
 BROKEN = {
-    "hentaifox",
-    "livedoor",
+    "erolord",
     "mangapark",
-    "yaplog",
+    "photobucket",
 }
 
 
@@ -56,10 +55,11 @@ class TestExtractorResults(unittest.TestCase):
         if result:
             if "options" in result:
                 for key, value in result["options"]:
-                    config.set(key.split("."), value)
+                    key = key.split(".")
+                    config.set(key[:-1], key[-1], value)
             if "range" in result:
-                config.set(("image-range",), result["range"])
-                config.set(("chapter-range",), result["range"])
+                config.set((), "image-range"  , result["range"])
+                config.set((), "chapter-range", result["range"])
             content = "content" in result
         else:
             content = False
@@ -79,14 +79,18 @@ class TestExtractorResults(unittest.TestCase):
             pass
         except exception.HttpError as exc:
             exc = str(exc)
-            if re.match(r"5\d\d: ", exc) or \
+            if re.match(r"'5\d\d ", exc) or \
                     re.search(r"\bRead timed out\b", exc):
                 self._skipped.append((url, exc))
                 self.skipTest(exc)
             raise
 
-        # test archive-id uniqueness
-        self.assertEqual(len(set(tjob.archive_list)), len(tjob.archive_list))
+        if result.get("archive", True):
+            self.assertEqual(
+                len(set(tjob.archive_list)),
+                len(tjob.archive_list),
+                "archive-id uniqueness",
+            )
 
         if tjob.queue:
             # test '_extractor' entries
@@ -185,7 +189,7 @@ class ResultJob(job.DownloadJob):
         self._update_url(url)
         self._update_kwdict(kwdict)
         self._update_archive(kwdict)
-        self._update_content(url)
+        self._update_content(url, kwdict)
         self.format_filename(kwdict)
 
     def handle_directory(self, kwdict):
@@ -204,7 +208,7 @@ class ResultJob(job.DownloadJob):
     def _update_kwdict(self, kwdict, to_list=True):
         if to_list:
             self.kwdict_list.append(kwdict.copy())
-        kwdict = self._filter(kwdict)
+        kwdict = util.filter_dict(kwdict)
         self.kwdict_hash.update(
             json.dumps(kwdict, sort_keys=True, default=str).encode())
 
@@ -213,9 +217,10 @@ class ResultJob(job.DownloadJob):
         self.archive_list.append(archive_id)
         self.archive_hash.update(archive_id.encode())
 
-    def _update_content(self, url):
+    def _update_content(self, url, kwdict):
         if self.content:
             scheme = url.partition(":")[0]
+            self.fileobj.kwdict = kwdict
             self.get_downloader(scheme).download(url, self.fileobj)
 
 
@@ -281,34 +286,36 @@ def setup_test_config():
     email = "gallerydl@openaliasbox.org"
 
     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)
-    config.set(("extractor", "nijie"    , "username"), email)
-    config.set(("extractor", "seiga"    , "username"), email)
-
-    config.set(("extractor", "danbooru" , "username"), None)
-    config.set(("extractor", "instagram", "username"), None)
-    config.set(("extractor", "imgur"    , "username"), None)
-    config.set(("extractor", "twitter"  , "username"), None)
-
-    config.set(("extractor", "mangoxo"  , "username"), "LiQiang3")
-    config.set(("extractor", "mangoxo"  , "password"), "5zbQF10_5u25259Ma")
-
-    config.set(("extractor", "deviantart", "client-id"), "7777")
-    config.set(("extractor", "deviantart", "client-secret"),
+    config.set(("cache",), "file", None)
+    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)
+
+    config.set(("extractor", "nijie")     , "username", email)
+    config.set(("extractor", "seiga")     , "username", email)
+    config.set(("extractor", "danbooru")  , "username", None)
+    config.set(("extractor", "instagram") , "username", None)
+    config.set(("extractor", "twitter")   , "username", None)
+
+    config.set(("extractor", "newgrounds"), "username", "d1618111")
+    config.set(("extractor", "newgrounds"), "password", "d1618111")
+
+    config.set(("extractor", "mangoxo")   , "username", "LiQiang3")
+    config.set(("extractor", "mangoxo")   , "password", "5zbQF10_5u25259Ma")
+
+    config.set(("extractor", "deviantart"), "client-id", "7777")
+    config.set(("extractor", "deviantart"), "client-secret",
                "ff14994c744d9208e5caeec7aab4a026")
 
-    config.set(("extractor", "tumblr", "api-key"),
+    config.set(("extractor", "tumblr"), "api-key",
                "0cXoHfIqVzMQcc3HESZSNsVlulGxEXGDTTZCDrRrjaa0jmuTc6")
-    config.set(("extractor", "tumblr", "api-secret"),
+    config.set(("extractor", "tumblr"), "api-secret",
                "6wxAK2HwrXdedn7VIoZWxGqVhZ8JdYKDLjiQjL46MLqGuEtyVj")
-    config.set(("extractor", "tumblr", "access-token"),
+    config.set(("extractor", "tumblr"), "access-token",
                "N613fPV6tOZQnyn0ERTuoEZn0mEqG8m2K8M3ClSJdEHZJuqFdG")
-    config.set(("extractor", "tumblr", "access-token-secret"),
+    config.set(("extractor", "tumblr"), "access-token-secret",
                "sgOA7ZTT4FBXdOGGVV331sSp0jHYp4yMDRslbhaQf7CaS71i4O")