From e50861e62f6cf695ba087ab161b3938be7c2b131 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 25 Nov 2020 10:41:03 +0100 Subject: mtest/TAPParser: use typing.NamedTuple It is cleaner than collections.namedtuple. It also catches that "count()" is a method on tuple, so rename the field to num_tests. Signed-off-by: Paolo Bonzini --- run_unittests.py | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 709f019..9569e14 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -8889,25 +8889,25 @@ class TAPParserTests(unittest.TestCase): def test_empty_plan(self): events = self.parse_tap('1..0') - self.assert_plan(events, count=0, late=False, skipped=True) + self.assert_plan(events, num_tests=0, late=False, skipped=True) self.assert_last(events) def test_plan_directive(self): events = self.parse_tap('1..0 # skipped for some reason') - self.assert_plan(events, count=0, late=False, skipped=True, + self.assert_plan(events, num_tests=0, late=False, skipped=True, explanation='for some reason') self.assert_last(events) events = self.parse_tap('1..1 # skipped for some reason\nok 1') self.assert_error(events) - self.assert_plan(events, count=1, late=False, skipped=True, + self.assert_plan(events, num_tests=1, late=False, skipped=True, explanation='for some reason') self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) events = self.parse_tap('1..1 # todo not supported here\nok 1') self.assert_error(events) - self.assert_plan(events, count=1, late=False, skipped=False, + self.assert_plan(events, num_tests=1, late=False, skipped=False, explanation='not supported here') self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) @@ -8953,7 +8953,7 @@ class TAPParserTests(unittest.TestCase): def test_many_early_plan(self): events = self.parse_tap('1..4\nok 1\nnot ok 2\nok 3\nnot ok 4') - self.assert_plan(events, count=4, late=False) + self.assert_plan(events, num_tests=4, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_test(events, number=3, name='', result=TestResult.OK) @@ -8966,7 +8966,7 @@ class TAPParserTests(unittest.TestCase): self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_test(events, number=3, name='', result=TestResult.OK) self.assert_test(events, number=4, name='', result=TestResult.FAIL) - self.assert_plan(events, count=4, late=True) + self.assert_plan(events, num_tests=4, late=True) self.assert_last(events) def test_directive_case(self): @@ -8991,14 +8991,14 @@ class TAPParserTests(unittest.TestCase): def test_one_test_early_plan(self): events = self.parse_tap('1..1\nok') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) def test_one_test_late_plan(self): events = self.parse_tap('ok\n1..1') self.assert_test(events, number=1, name='', result=TestResult.OK) - self.assert_plan(events, count=1, late=True) + self.assert_plan(events, num_tests=1, late=True) self.assert_last(events) def test_out_of_order(self): @@ -9010,14 +9010,14 @@ class TAPParserTests(unittest.TestCase): def test_middle_plan(self): events = self.parse_tap('ok 1\n1..2\nok 2') self.assert_test(events, number=1, name='', result=TestResult.OK) - self.assert_plan(events, count=2, late=True) + self.assert_plan(events, num_tests=2, late=True) self.assert_error(events) self.assert_test(events, number=2, name='', result=TestResult.OK) self.assert_last(events) def test_too_many_plans(self): events = self.parse_tap('1..1\n1..2\nok 1') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_error(events) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) @@ -9026,12 +9026,12 @@ class TAPParserTests(unittest.TestCase): events = self.parse_tap('ok 1\nnot ok 2\n1..1') self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) - self.assert_plan(events, count=1, late=True) + self.assert_plan(events, num_tests=1, late=True) self.assert_error(events) self.assert_last(events) events = self.parse_tap('1..1\nok 1\nnot ok 2') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_error(events) @@ -9041,12 +9041,12 @@ class TAPParserTests(unittest.TestCase): events = self.parse_tap('ok 1\nnot ok 2\n1..3') self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) - self.assert_plan(events, count=3, late=True) + self.assert_plan(events, num_tests=3, late=True) self.assert_error(events) self.assert_last(events) events = self.parse_tap('1..3\nok 1\nnot ok 2') - self.assert_plan(events, count=3, late=False) + self.assert_plan(events, num_tests=3, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_error(events) @@ -9054,7 +9054,7 @@ class TAPParserTests(unittest.TestCase): def test_too_few_bailout(self): events = self.parse_tap('1..3\nok 1\nnot ok 2\nBail out! no third test') - self.assert_plan(events, count=3, late=False) + self.assert_plan(events, num_tests=3, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_bailout(events, message='no third test') @@ -9062,29 +9062,29 @@ class TAPParserTests(unittest.TestCase): def test_diagnostics(self): events = self.parse_tap('1..1\n# ignored\nok 1') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) events = self.parse_tap('# ignored\n1..1\nok 1\n# ignored too') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) events = self.parse_tap('# ignored\nok 1\n1..1\n# ignored too') self.assert_test(events, number=1, name='', result=TestResult.OK) - self.assert_plan(events, count=1, late=True) + self.assert_plan(events, num_tests=1, late=True) self.assert_last(events) def test_empty_line(self): events = self.parse_tap('1..1\n\nok 1') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) def test_unexpected(self): events = self.parse_tap('1..1\ninvalid\nok 1') - self.assert_plan(events, count=1, late=False) + self.assert_plan(events, num_tests=1, late=False) self.assert_error(events) self.assert_test(events, number=1, name='', result=TestResult.OK) self.assert_last(events) @@ -9099,7 +9099,7 @@ class TAPParserTests(unittest.TestCase): self.assert_last(events) events = self.parse_tap('1..0\nTAP version 13\n') - self.assert_plan(events, count=0, late=False, skipped=True) + self.assert_plan(events, num_tests=0, late=False, skipped=True) self.assert_error(events) self.assert_last(events) -- cgit v1.1