New upstream version 1.15.3.upstream/1.15.3

4 files changed, 27 insertions, 12 deletions

diff --git a/test/test_extractor.py b/test/test_extractor.py
index 162edc0..8bc3a27 100644
--- a/test/test_extractor.py
+++ b/test/test_extractor.py
@@ -22,6 +22,8 @@ from gallery_dl.extractor import mastodon  # noqa E402
 from gallery_dl.extractor.common import Extractor, Message  # noqa E402
 from gallery_dl.extractor.directlink import DirectlinkExtractor  # noqa E402
 
+_list_classes = extractor._list_classes
+
 
 class FakeExtractor(Extractor):
     category = "fake"
@@ -45,6 +47,7 @@ class TestExtractorModule(unittest.TestCase):
     def setUp(self):
         extractor._cache.clear()
         extractor._module_iter = iter(extractor.modules)
+        extractor._list_classes = _list_classes
 
     def test_find(self):
         for uri in self.VALID_URIS:
diff --git a/test/test_postprocessor.py b/test/test_postprocessor.py
index ff98477..524e501 100644
--- a/test/test_postprocessor.py
+++ b/test/test_postprocessor.py
@@ -235,18 +235,20 @@ class MetadataTest(BasePostprocessorTest):
         self.assertEqual(self._output(m), "foo\nbar\nbaz\n")
 
     def test_metadata_custom(self):
-        pp = self._create(
-            {"mode": "custom", "format": "{foo}\n{missing}\n"},
-            {"foo": "bar"},
-        )
-        self.assertEqual(pp.write, pp._write_custom)
-        self.assertEqual(pp.extension, "txt")
-        self.assertTrue(pp.contentfmt)
+        def test(pp_info):
+            pp = self._create(pp_info, {"foo": "bar"})
+            self.assertEqual(pp.write, pp._write_custom)
+            self.assertEqual(pp.extension, "txt")
+            self.assertTrue(pp.contentfmt)
 
-        with patch("builtins.open", mock_open()) as m:
-            pp.prepare(self.pathfmt)
-            pp.run(self.pathfmt)
-        self.assertEqual(self._output(m), "bar\nNone\n")
+            with patch("builtins.open", mock_open()) as m:
+                pp.prepare(self.pathfmt)
+                pp.run(self.pathfmt)
+            self.assertEqual(self._output(m), "bar\nNone\n")
+
+        test({"mode": "custom", "content-format": "{foo}\n{missing}\n"})
+        test({"mode": "custom", "content-format": ["{foo}", "{missing}"]})
+        test({"mode": "custom", "format": "{foo}\n{missing}\n"})
 
     def test_metadata_extfmt(self):
         pp = self._create({
diff --git a/test/test_results.py b/test/test_results.py
index d54017e..239b5ad 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -30,7 +30,7 @@ TRAVIS_SKIP = {
 
 # temporary issues, etc.
 BROKEN = {
-    "imgbox",
+    "4plebs",
     "imagevenue",
     "mangapanda",
     "photobucket",
diff --git a/test/test_util.py b/test/test_util.py
index 08ecd64..fd659a0 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -446,6 +446,16 @@ class TestOther(unittest.TestCase):
         self.assertCountEqual(
             util.advance(util.advance(items, 1), 2), range(3, 5))
 
+    def test_unique(self):
+        self.assertSequenceEqual(
+            list(util.unique("")), "")
+        self.assertSequenceEqual(
+            list(util.unique("AABBCC")), "ABC")
+        self.assertSequenceEqual(
+            list(util.unique("ABABABCAABBCC")), "ABC")
+        self.assertSequenceEqual(
+            list(util.unique([1, 2, 1, 3, 2, 1])), [1, 2, 3])
+
     def test_raises(self):
         func = util.raises(Exception)
         with self.assertRaises(Exception):