Skip to content

Commit fc4cae7

Browse files
committed
Regenerated golden files for subtest and output tests.
1 parent c52480f commit fc4cae7

File tree

6 files changed

+70
-76
lines changed

6 files changed

+70
-76
lines changed

test/example-all-fail-tasks-and-subtests/example_all_fail_tasks_and_subtests_test.py

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,21 @@ class ExampleAllFailTest(unittest.TestCase):
1111
def test_hello(self):
1212
input_data = [15, 23, 33, 39]
1313
result_data = [("Hello, World!", param) for param in input_data]
14-
number_of_variants = range(1, len(input_data) + 1)
1514

16-
for variant, param, result in zip(number_of_variants, input_data, result_data):
15+
for variant, (param, result) in enumerate(zip(input_data, result_data), start=1):
16+
failure_msg=f'Expected: {result} but got something else instead.'
1717
with self.subTest(f"variation #{variant}", param=param, result=result):
18-
self.assertEqual(hello(param), result,
19-
msg=f'Expected: {result} but got something else instead.')
18+
self.assertEqual(hello(param), result, msg=failure_msg)
2019

2120
@pytest.mark.task(taskno=1)
2221
def test_abc(self):
2322
input_data = ['frog', 'fish', 'coconut', 'pineapple', 'carrot', 'cucumber', 'grass', 'tree']
2423
result_data = [("Hello, World!", param) for param in input_data]
25-
number_of_variants = range(1, len(input_data) + 1)
2624

27-
for variant, param, result in zip(number_of_variants, input_data, result_data):
25+
for variant, (param, result) in enumerate(zip(input_data, result_data), start=1):
26+
failure_msg=f'Expected: {result} but got something else instead.'
2827
with self.subTest(f"variation #{variant}", param=param, result=result):
29-
self.assertEqual(hello(param), result,
30-
msg=f'Expected: {result} but got something else instead.')
28+
self.assertEqual(hello(param), result, msg=failure_msg)
3129

3230

3331
class ExampleAllFailOtherTest(unittest.TestCase):
@@ -36,24 +34,18 @@ class ExampleAllFailOtherTest(unittest.TestCase):
3634
def test_dummy(self):
3735
input_data = ['frog', 'fish', 'coconut', 'pineapple', 'carrot', 'cucumber', 'grass', 'tree']
3836
result_data = [("Hello, World!", param) for param in input_data]
39-
number_of_variants = range(1, len(input_data) + 1)
4037

41-
for variant, param, result in zip(number_of_variants, input_data, result_data):
38+
for variant, (param, result) in enumerate(zip(input_data, result_data), start=1):
39+
failure_msg=f'Expected: {result} but got something else instead.'
4240
with self.subTest(f"variation #{variant}", param=param, result=result):
43-
self.assertEqual(hello(param), result,
44-
msg=f'Expected: {result} but got something else instead.')
41+
self.assertEqual(hello(param), result, msg=failure_msg)
4542

4643
@pytest.mark.task(taskno=2)
4744
def test_hello(self):
4845
input_data = [1, 2, 5, 10]
4946
result_data = [("Hello, World!", param) for param in input_data]
50-
number_of_variants = range(1, len(input_data) + 1)
5147

52-
for variant, param, result in zip(number_of_variants, input_data, result_data):
48+
for variant, (param, result) in enumerate(zip(input_data, result_data), start=1):
49+
failure_msg=f'Expected: {result} but got something else instead.'
5350
with self.subTest(f"variation #{variant}", param=param, result=result):
54-
self.assertEqual(hello(param), result,
55-
msg=f'Expected: {result} but got something else instead.')
56-
57-
58-
if __name__ == "__main__":
59-
unittest.main()
51+
self.assertEqual(hello(param), result, msg=failure_msg)

0 commit comments

Comments
 (0)