Skip to content

bpo-45102: unittest: add tests for skipping and errors in cleanup #28166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 138 additions & 0 deletions Lib/unittest/test/test_skipping.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,58 @@ class Foo(Mixin, unittest.TestCase):
self.assertEqual(result.skipped, [(test, "testing")])
self.assertEqual(record, [])

def test_skip_in_setup(self):
class Foo(unittest.TestCase):
def setUp(self):
self.skipTest("skip")
def test_skip_me(self):
self.fail("shouldn't come here")
events = []
result = LoggingResult(events)
test = Foo("test_skip_me")
self.assertIs(test.run(result), result)
self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
self.assertEqual(result.skipped, [(test, "skip")])

def test_skip_in_cleanup(self):
class Foo(unittest.TestCase):
def test_skip_me(self):
pass
def tearDown(self):
self.skipTest("skip")
events = []
result = LoggingResult(events)
test = Foo("test_skip_me")
self.assertIs(test.run(result), result)
self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
self.assertEqual(result.skipped, [(test, "skip")])

def test_failure_and_skip_in_cleanup(self):
class Foo(unittest.TestCase):
def test_skip_me(self):
self.fail("fail")
def tearDown(self):
self.skipTest("skip")
events = []
result = LoggingResult(events)
test = Foo("test_skip_me")
self.assertIs(test.run(result), result)
self.assertEqual(events, ['startTest', 'addSkip', 'addFailure', 'stopTest'])
self.assertEqual(result.skipped, [(test, "skip")])

def test_skipping_and_fail_in_cleanup(self):
class Foo(unittest.TestCase):
def test_skip_me(self):
self.skipTest("skip")
def tearDown(self):
self.fail("fail")
events = []
result = LoggingResult(events)
test = Foo("test_skip_me")
self.assertIs(test.run(result), result)
self.assertEqual(events, ['startTest', 'addSkip', 'addFailure', 'stopTest'])
self.assertEqual(result.skipped, [(test, "skip")])

def test_expected_failure(self):
class Foo(unittest.TestCase):
@unittest.expectedFailure
Expand All @@ -172,7 +224,9 @@ def test_die(self):
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addExpectedFailure', 'stopTest'])
self.assertFalse(result.failures)
self.assertEqual(result.expectedFailures[0][0], test)
self.assertFalse(result.unexpectedSuccesses)
self.assertTrue(result.wasSuccessful())

def test_expected_failure_with_wrapped_class(self):
Expand All @@ -187,7 +241,9 @@ def test_1(self):
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addExpectedFailure', 'stopTest'])
self.assertFalse(result.failures)
self.assertEqual(result.expectedFailures[0][0], test)
self.assertFalse(result.unexpectedSuccesses)
self.assertTrue(result.wasSuccessful())

def test_expected_failure_with_wrapped_subclass(self):
Expand All @@ -205,7 +261,9 @@ class Bar(Foo):
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addExpectedFailure', 'stopTest'])
self.assertFalse(result.failures)
self.assertEqual(result.expectedFailures[0][0], test)
self.assertFalse(result.unexpectedSuccesses)
self.assertTrue(result.wasSuccessful())

def test_expected_failure_subtests(self):
Expand All @@ -229,8 +287,48 @@ def test_die(self):
self.assertEqual(events,
['startTest', 'addSubTestSuccess',
'addExpectedFailure', 'stopTest'])
self.assertFalse(result.failures)
self.assertEqual(len(result.expectedFailures), 1)
self.assertIs(result.expectedFailures[0][0], test)
self.assertFalse(result.unexpectedSuccesses)
self.assertTrue(result.wasSuccessful())

def test_expected_failure_and_fail_in_cleanup(self):
class Foo(unittest.TestCase):
@unittest.expectedFailure
def test_die(self):
self.fail("help me!")
def tearDown(self):
self.fail("bad tearDown")
events = []
result = LoggingResult(events)
test = Foo("test_die")
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addFailure', 'stopTest'])
self.assertEqual(len(result.failures), 1)
self.assertIn('AssertionError: bad tearDown', result.failures[0][1])
self.assertFalse(result.expectedFailures)
self.assertFalse(result.unexpectedSuccesses)
self.assertFalse(result.wasSuccessful())

def test_expected_failure_and_skip_in_cleanup(self):
class Foo(unittest.TestCase):
@unittest.expectedFailure
def test_die(self):
self.fail("help me!")
def tearDown(self):
self.skipTest("skip")
events = []
result = LoggingResult(events)
test = Foo("test_die")
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addSkip', 'stopTest'])
self.assertFalse(result.failures)
self.assertFalse(result.expectedFailures)
self.assertFalse(result.unexpectedSuccesses)
self.assertEqual(result.skipped, [(test, "skip")])
self.assertTrue(result.wasSuccessful())

def test_unexpected_success(self):
Expand All @@ -245,6 +343,7 @@ def test_die(self):
self.assertEqual(events,
['startTest', 'addUnexpectedSuccess', 'stopTest'])
self.assertFalse(result.failures)
self.assertFalse(result.expectedFailures)
self.assertEqual(result.unexpectedSuccesses, [test])
self.assertFalse(result.wasSuccessful())

Expand All @@ -269,9 +368,48 @@ def test_die(self):
'addSubTestSuccess', 'addSubTestSuccess',
'addUnexpectedSuccess', 'stopTest'])
self.assertFalse(result.failures)
self.assertFalse(result.expectedFailures)
self.assertEqual(result.unexpectedSuccesses, [test])
self.assertFalse(result.wasSuccessful())

def test_unexpected_success_and_fail_in_cleanup(self):
class Foo(unittest.TestCase):
@unittest.expectedFailure
def test_die(self):
pass
def tearDown(self):
self.fail("bad tearDown")
events = []
result = LoggingResult(events)
test = Foo("test_die")
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addFailure', 'stopTest'])
self.assertEqual(len(result.failures), 1)
self.assertIn('AssertionError: bad tearDown', result.failures[0][1])
self.assertFalse(result.expectedFailures)
self.assertFalse(result.unexpectedSuccesses)
self.assertFalse(result.wasSuccessful())

def test_unexpected_success_and_skip_in_cleanup(self):
class Foo(unittest.TestCase):
@unittest.expectedFailure
def test_die(self):
pass
def tearDown(self):
self.skipTest("skip")
events = []
result = LoggingResult(events)
test = Foo("test_die")
self.assertIs(test.run(result), result)
self.assertEqual(events,
['startTest', 'addSkip', 'stopTest'])
self.assertFalse(result.failures)
self.assertFalse(result.expectedFailures)
self.assertFalse(result.unexpectedSuccesses)
self.assertEqual(result.skipped, [(test, "skip")])
self.assertTrue(result.wasSuccessful())

def test_skip_doesnt_run_setup(self):
class Foo(unittest.TestCase):
wasSetUp = False
Expand Down