From 174117f8276d40a5866747fa41faf7be9e4937c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Wed, 15 Jan 2020 23:46:37 +0100 Subject: [PATCH] allow multiple hashes for content tests --- gallery_dl/extractor/slickpic.py | 5 +++-- test/test_results.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/slickpic.py b/gallery_dl/extractor/slickpic.py index 127cce89..1063716d 100644 --- a/gallery_dl/extractor/slickpic.py +++ b/gallery_dl/extractor/slickpic.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019 Mike Fährmann +# Copyright 2019-2020 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -41,7 +41,8 @@ class SlickpicAlbumExtractor(SlickpicExtractor): }), ("https://mattcrandall.slickpic.com/albums/LamborghiniMurcielago/", { "range": "34", - "content": "cec6630e659dc72db1ee1a9a6f3b525189261988", + "content": ("cec6630e659dc72db1ee1a9a6f3b525189261988", + "6f81e1e74c6cd6db36844e7211eef8e7cd30055d"), }), ) diff --git a/test/test_results.py b/test/test_results.py index c2bd8a83..e87b4b8e 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -109,7 +109,12 @@ class TestExtractorResults(unittest.TestCase): self.assertEqual(result["url"], tjob.url_hash.hexdigest()) if "content" in result: - self.assertEqual(result["content"], tjob.content_hash.hexdigest()) + expected = result["content"] + digest = tjob.content_hash.hexdigest() + if isinstance(expected, str): + self.assertEqual(digest, expected, "content") + else: # assume iterable + self.assertIn(digest, expected, "content") if "keyword" in result: expected = result["keyword"]