Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[tests] make "#category" result entries optional

Browse Source 
use categories of the given "#class"
when "#category" is not specified
This commit is contained in:
Mike Fährmann 2024-09-21 21:45:45 +02:00
parent 8bf081d295
commit 14c57f771c
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/test_extractor.py
View File

@ -105,15 +105,23 @@ class TestExtractorModule(unittest.TestCase):
def test_categories(self):
for result in results.all():
url = result["#url"]
base, cat, sub = result["#category"]
cls = result["#class"]
try:
extr = result["#class"].from_url(url)
extr = cls.from_url(url)
except ImportError as exc:
if exc.name in ("youtube_dl", "yt_dlp"):
print("Skipping '{}' category checks".format(cat))
print("Skipping '{}' category checks".format(cls.category))
continue
raise
self.assertTrue(extr, url)
categories = result.get("#category")
if categories:
base, cat, sub = categories
else:
cat = cls.category
sub = cls.subcategory
base = cls.basecategory
self.assertEqual(extr.category, cat, url)
self.assertEqual(extr.subcategory, sub, url)
self.assertEqual(extr.basecategory, base, url)

32
test/test_results.py
View File

@ -43,7 +43,8 @@ CONFIG = {
},
}
AUTH = {
AUTH_REQUIRED = {
"pixiv",
"nijie",
"horne",
@ -54,7 +55,7 @@ AUTH = {
"twitter",
}
AUTH_CONFIG = (
AUTH_KEYS = (
"username",
"cookies",
"api-key",
@ -91,24 +92,26 @@ class TestExtractorResults(unittest.TestCase):
self.assertGreaterEqual(value, range.start, msg=msg)
def _run_test(self, result):
base, cat, sub = result_categories(result)
result.pop("#comment", None)
result.pop("#category", None)
auth = result.pop("#auth", None)
extractor.find(result["#url"])
extr = result["#class"].from_url(result["#url"])
if not extr:
raise exception.NoExtractorError()
if len(result) <= 3:
if len(result) <= 2:
return # only matching
if auth is None:
auth = (result["#category"][1] in AUTH)
auth = (cat in AUTH_REQUIRED)
elif not auth:
# auth explicitly disabled
for key in AUTH_CONFIG:
for key in AUTH_KEYS:
config.set((), key, None)
if auth and not any(extr.config(key) for key in AUTH_CONFIG):
if auth and not any(extr.config(key) for key in AUTH_KEYS):
return self._skipped.append((result["#url"], "no auth"))
if "#options" in result:
@ -411,6 +414,15 @@ def load_test_config():
path, exc.__class__.__name__, exc))
def result_categories(result):
categories = result.get("#category")
if categories:
return categories
cls = result["#class"]
return cls.basecategory, cls.category, cls.subcategory
def generate_tests():
"""Dynamically generate extractor unittests"""
def _generate_method(result):
@ -437,7 +449,7 @@ def generate_tests():
if category.startswith("+"):
basecategory = category[1:].lower()
tests = [t for t in results.all()
if t["#category"][0].lower() == basecategory]
if result_categories(t)[0].lower() == basecategory]
else:
tests = results.category(category)
@ -450,14 +462,16 @@ def generate_tests():
tests = [t for t in tests
if "#comment" in t and com in t["#comment"].lower()]
else:
tests = [t for t in tests if t["#category"][-1] == subcategory]
tests = [t for t in tests
if result_categories(t)[-1] == subcategory]
else:
tests = results.all()
# add 'test_...' methods
enum = collections.defaultdict(int)
for result in tests:
name = "{1}_{2}".format(*result["#category"])
base, cat, sub = result_categories(result)
name = "{}_{}".format(cat, sub)
enum[name] += 1
method = _generate_method(result)