From 9074eee175f76b824fbb6695d56426105191c51c Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 28 Sep 2020 18:27:46 -0400 Subject: New upstream version 1.15.0. --- test/test_config.py | 22 ++++++++++++++++++++++ test/test_downloader.py | 17 +++++++++++++++++ test/test_extractor.py | 24 ------------------------ test/test_postprocessor.py | 31 +++++++++++++++++-------------- test/test_results.py | 5 +++-- test/test_util.py | 2 +- 6 files changed, 60 insertions(+), 41 deletions(-) (limited to 'test') diff --git a/test/test_config.py b/test/test_config.py index a9cefd4..7cbb12b 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -96,6 +96,28 @@ class TestConfig(unittest.TestCase): test(("Z1", "Z2", "A1", "A2", "A3"), 999, 8) test((), 9) + def test_accumulate(self): + self.assertEqual(config.accumulate((), "l"), []) + + config.set(() , "l", [5, 6]) + config.set(("c",) , "l", [3, 4]) + config.set(("c", "c"), "l", [1, 2]) + self.assertEqual( + config.accumulate((), "l") , [5, 6]) + self.assertEqual( + config.accumulate(("c",), "l") , [3, 4, 5, 6]) + self.assertEqual( + config.accumulate(("c", "c"), "l"), [1, 2, 3, 4, 5, 6]) + + config.set(("c",), "l", None) + config.unset(("c", "c"), "l") + self.assertEqual( + config.accumulate((), "l") , [5, 6]) + self.assertEqual( + config.accumulate(("c",), "l") , [5, 6]) + self.assertEqual( + config.accumulate(("c", "c"), "l"), [5, 6]) + def test_set(self): config.set(() , "c", [1, 2, 3]) config.set(("b",) , "c", [1, 2, 3]) diff --git a/test/test_downloader.py b/test/test_downloader.py index 5d73a4c..99cfb62 100644 --- a/test/test_downloader.py +++ b/test/test_downloader.py @@ -179,6 +179,9 @@ class TestHTTPDownloader(TestDownloaderBase): server = http.server.HTTPServer(("", port), HttpRequestHandler) threading.Thread(target=server.serve_forever, daemon=True).start() + def tearDown(self): + self.downloader.minsize = self.downloader.maxsize = None + def test_http_download(self): self._run_test(self._jpg, None, DATA_JPG, "jpg", "jpg") self._run_test(self._png, None, DATA_PNG, "png", "png") @@ -199,6 +202,20 @@ class TestHTTPDownloader(TestDownloaderBase): self._run_test(self._png, None, DATA_PNG, "gif", "png") self._run_test(self._gif, None, DATA_GIF, "jpg", "gif") + def test_http_filesize_min(self): + pathfmt = self._prepare_destination(None, extension=None) + self.downloader.minsize = 100 + with self.assertLogs(self.downloader.log, "WARNING"): + success = self.downloader.download(self._gif, pathfmt) + self.assertFalse(success) + + def test_http_filesize_max(self): + pathfmt = self._prepare_destination(None, extension=None) + self.downloader.maxsize = 100 + with self.assertLogs(self.downloader.log, "WARNING"): + success = self.downloader.download(self._jpg, pathfmt) + self.assertFalse(success) + class TestTextDownloader(TestDownloaderBase): diff --git a/test/test_extractor.py b/test/test_extractor.py index 043bd52..162edc0 100644 --- a/test/test_extractor.py +++ b/test/test_extractor.py @@ -75,30 +75,6 @@ class TestExtractorModule(unittest.TestCase): self.assertEqual(classes[0], FakeExtractor) self.assertIsInstance(extractor.find(uri), FakeExtractor) - def test_blacklist(self): - link_uri = "https://example.org/file.jpg" - test_uri = "test:" - fake_uri = "fake:" - - self.assertIsInstance(extractor.find(link_uri), DirectlinkExtractor) - self.assertIsInstance(extractor.find(test_uri), Extractor) - self.assertIsNone(extractor.find(fake_uri)) - - with extractor.blacklist(["directlink"]): - self.assertIsNone(extractor.find(link_uri)) - self.assertIsInstance(extractor.find(test_uri), Extractor) - self.assertIsNone(extractor.find(fake_uri)) - - with extractor.blacklist([], [DirectlinkExtractor, FakeExtractor]): - self.assertIsNone(extractor.find(link_uri)) - self.assertIsInstance(extractor.find(test_uri), Extractor) - self.assertIsNone(extractor.find(fake_uri)) - - with extractor.blacklist(["test"], [DirectlinkExtractor]): - self.assertIsNone(extractor.find(link_uri)) - self.assertIsNone(extractor.find(test_uri)) - self.assertIsNone(extractor.find(fake_uri)) - def test_from_url(self): for uri in self.VALID_URIS: cls = extractor.find(uri).__class__ diff --git a/test/test_postprocessor.py b/test/test_postprocessor.py index 5da3131..ff98477 100644 --- a/test/test_postprocessor.py +++ b/test/test_postprocessor.py @@ -342,9 +342,20 @@ class ZipTest(BasePostprocessorTest): self.assertEqual(pp.path, self.pathfmt.realdirectory) self.assertEqual(pp.run, pp._write) self.assertEqual(pp.delete, True) - self.assertFalse(hasattr(pp, "args")) - self.assertEqual(pp.zfile.compression, zipfile.ZIP_STORED) - self.assertTrue(pp.zfile.filename.endswith("/test.zip")) + self.assertEqual(pp.args, ( + pp.path[:-1] + ".zip", "a", zipfile.ZIP_STORED, True, + )) + self.assertTrue(pp.args[0].endswith("/test.zip")) + + def test_zip_safe(self): + pp = self._create({"mode": "safe"}) + self.assertEqual(pp.path, self.pathfmt.realdirectory) + self.assertEqual(pp.run, pp._write_safe) + self.assertEqual(pp.delete, True) + self.assertEqual(pp.args, ( + pp.path[:-1] + ".zip", "a", zipfile.ZIP_STORED, True, + )) + self.assertTrue(pp.args[0].endswith("/test.zip")) def test_zip_options(self): pp = self._create({ @@ -353,22 +364,13 @@ class ZipTest(BasePostprocessorTest): "extension": "cbz", }) self.assertEqual(pp.delete, False) - self.assertEqual(pp.zfile.compression, zipfile.ZIP_DEFLATED) - self.assertTrue(pp.zfile.filename.endswith("/test.cbz")) - - def test_zip_safe(self): - pp = self._create({"mode": "safe"}) - self.assertEqual(pp.delete, True) - self.assertEqual(pp.path, self.pathfmt.realdirectory) - self.assertEqual(pp.run, pp._write_safe) self.assertEqual(pp.args, ( - pp.path[:-1] + ".zip", "a", zipfile.ZIP_STORED, True, + pp.path[:-1] + ".cbz", "a", zipfile.ZIP_DEFLATED, True, )) - self.assertTrue(pp.args[0].endswith("/test.zip")) + self.assertTrue(pp.args[0].endswith("/test.cbz")) def test_zip_write(self): pp = self._create() - nti = pp.zfile.NameToInfo with tempfile.NamedTemporaryFile("w", dir=self.dir.name) as file: file.write("foobar\n") @@ -382,6 +384,7 @@ class ZipTest(BasePostprocessorTest): pp.prepare(self.pathfmt) pp.run(self.pathfmt) + nti = pp.zfile.NameToInfo self.assertEqual(len(nti), i+1) self.assertIn(name, nti) diff --git a/test/test_results.py b/test/test_results.py index fbbb79c..1380f31 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -31,10 +31,11 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { - "dokireader", + "8kun", + "dynastyscans", + "fallenangels", "imagevenue", "photobucket", - "worldthree", } diff --git a/test/test_util.py b/test/test_util.py index 5fbaa4e..1515814 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -339,7 +339,7 @@ class TestFormatter(unittest.TestCase): self._run_test("{z|a!C:RH/C/}", "Cello World") self._run_test("{z|y|x:?/}", "") - self._run_test("{d[c]|d[b]|d[a]}", "0") + self._run_test("{d[c]|d[b]|d[a]}", "foo") self._run_test("{d[a]|d[b]|d[c]}", "foo") self._run_test("{d[z]|d[y]|d[x]}", "None") -- cgit v1.2.3