[tests/results] fix '#log' checks for URLs raising exceptions
This commit is contained in:
@@ -94,6 +94,7 @@ class TestExtractorResults(unittest.TestCase):
|
|||||||
def assertLogEqual(self, expected, output):
|
def assertLogEqual(self, expected, output):
|
||||||
if isinstance(expected, str):
|
if isinstance(expected, str):
|
||||||
expected = (expected,)
|
expected = (expected,)
|
||||||
|
self.assertEqual(len(expected), len(output), "#log/count")
|
||||||
|
|
||||||
for exp, out in zip(expected, output):
|
for exp, out in zip(expected, output):
|
||||||
level, name, message = out.split(":", 2)
|
level, name, message = out.split(":", 2)
|
||||||
@@ -165,7 +166,6 @@ class TestExtractorResults(unittest.TestCase):
|
|||||||
if "#log" in result:
|
if "#log" in result:
|
||||||
with self.assertLogs() as log_info:
|
with self.assertLogs() as log_info:
|
||||||
tjob.run()
|
tjob.run()
|
||||||
self.assertLogEqual(result["#log"], log_info.output)
|
|
||||||
else:
|
else:
|
||||||
tjob.run()
|
tjob.run()
|
||||||
except exception.StopExtraction:
|
except exception.StopExtraction:
|
||||||
@@ -178,6 +178,9 @@ class TestExtractorResults(unittest.TestCase):
|
|||||||
self.skipTest(exc)
|
self.skipTest(exc)
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
if "#log" in result:
|
||||||
|
self.assertLogEqual(result["#log"], log_info.output)
|
||||||
|
|
||||||
if result.get("#archive", True):
|
if result.get("#archive", True):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
len(set(tjob.archive_list)),
|
len(set(tjob.archive_list)),
|
||||||
|
|||||||
Reference in New Issue
Block a user