summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/test
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-16 13:25:43 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-16 13:25:43 (GMT)
commita7d00c207fbeb8ee51b56ed388ed38e37df0c04e (patch)
treed3c243bb2e5687e0dd782e00321518ab490be95f /Lib/unittest/test
parent75fb816c78be5668d5274df9c9a0c26d841339ad (diff)
downloadcpython-a7d00c207fbeb8ee51b56ed388ed38e37df0c04e.zip
cpython-a7d00c207fbeb8ee51b56ed388ed38e37df0c04e.tar.gz
cpython-a7d00c207fbeb8ee51b56ed388ed38e37df0c04e.tar.bz2
Reverted issue #24134 changes (except new tests).
Diffstat (limited to 'Lib/unittest/test')
-rw-r--r--Lib/unittest/test/test_case.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 08f2ae8..321d67a 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1147,9 +1147,6 @@ test case
# Failure when no exception is raised
with self.assertRaises(self.failureException):
self.assertRaises(ExceptionMock, lambda: 0)
- # Failure when the function is None
- with self.assertRaises(TypeError):
- self.assertRaises(ExceptionMock, None)
# Failure when another exception is raised
with self.assertRaises(ExceptionMock):
self.assertRaises(ValueError, Stub)
@@ -1187,8 +1184,6 @@ test case
self.assertRaisesRegex(ExceptionMock, re.compile('expect$'), Stub)
self.assertRaisesRegex(ExceptionMock, 'expect$', Stub)
- with self.assertRaises(TypeError):
- self.assertRaisesRegex(ExceptionMock, 'expect$', None)
def testAssertNotRaisesRegex(self):
self.assertRaisesRegex(
@@ -1256,9 +1251,6 @@ test case
# Failure when no warning is triggered
with self.assertRaises(self.failureException):
self.assertWarns(RuntimeWarning, lambda: 0)
- # Failure when the function is None
- with self.assertRaises(TypeError):
- self.assertWarns(RuntimeWarning, None)
# Failure when another warning is triggered
with warnings.catch_warnings():
# Force default filter (in case tests are run with -We)
@@ -1320,9 +1312,6 @@ test case
with self.assertRaises(self.failureException):
self.assertWarnsRegex(RuntimeWarning, "o+",
lambda: 0)
- # Failure when the function is None
- with self.assertRaises(TypeError):
- self.assertWarnsRegex(RuntimeWarning, "o+", None)
# Failure when another warning is triggered
with warnings.catch_warnings():
# Force default filter (in case tests are run with -We)