github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tests] use extended format strings for archive ID tests

Browse Source
This commit is contained in:
Mike Fährmann
2024-10-10 19:32:09 +02:00
parent 0f7d032773
commit 29e46f6875
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/test_results.py
View File

@@ -210,6 +210,7 @@ class TestExtractorResults(unittest.TestCase):
if "#urls" in result: if "#urls" in result:
expected = result["#urls"] expected = result["#urls"]
if isinstance(expected, str): if isinstance(expected, str):
self.assertTrue(tjob.url_list, msg="#urls")
self.assertEqual(tjob.url_list[0], expected, msg="#urls") self.assertEqual(tjob.url_list[0], expected, msg="#urls")
else: else:
self.assertSequenceEqual(tjob.url_list, expected, msg="#urls") self.assertSequenceEqual(tjob.url_list, expected, msg="#urls")
@@ -288,6 +289,8 @@ class ResultJob(job.DownloadJob):
"".join(self.extractor.directory_fmt)).format_map "".join(self.extractor.directory_fmt)).format_map
self.format_filename = TestFormatter( self.format_filename = TestFormatter(
self.extractor.filename_fmt).format_map self.extractor.filename_fmt).format_map
self.format_archive = TestFormatter(
self.extractor.archive_fmt).format_map
def run(self): def run(self):
self._init() self._init()
@@ -325,7 +328,7 @@ class ResultJob(job.DownloadJob):
json.dumps(kwdict, sort_keys=True, default=str).encode()) json.dumps(kwdict, sort_keys=True, default=str).encode())
def _update_archive(self, kwdict): def _update_archive(self, kwdict):
archive_id = self.extractor.archive_fmt.format_map(kwdict) archive_id = self.format_archive(kwdict)
self.archive_list.append(archive_id) self.archive_list.append(archive_id)
self.archive_hash.update(archive_id.encode()) self.archive_hash.update(archive_id.encode())