diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 16:32:13 -0400 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 16:32:13 -0400 |
| commit | 15111f26d4594a078a017e7fee5b92651c77b2b5 (patch) | |
| tree | ed474b4d39bc0ed87cfc40a33861b8427db0c578 /OpenSSL/test/util.py | |
| parent | 85ce662560419a34cf0fbfb60836e1602a693586 (diff) | |
| parent | 876b2ac5929fd9edcf7c03d1f28ee5334bce60ea (diff) | |
| download | pyopenssl-remove-rationale.tar.gz | |
merge masterremove-rationale
Diffstat (limited to 'OpenSSL/test/util.py')
| -rw-r--r-- | OpenSSL/test/util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSSL/test/util.py b/OpenSSL/test/util.py index 21bbdc4..4260eb0 100644 --- a/OpenSSL/test/util.py +++ b/OpenSSL/test/util.py @@ -227,7 +227,7 @@ class TestCase(TestCase): failIfIn = assertNotIn - def failUnlessIdentical(self, first, second, msg=None): + def assertIs(self, first, second, msg=None): """ Fail the test if :py:data:`first` is not :py:data:`second`. This is an obect-identity-equality test, not an object equality @@ -239,10 +239,10 @@ class TestCase(TestCase): if first is not second: raise self.failureException(msg or '%r is not %r' % (first, second)) return first - assertIdentical = failUnlessIdentical + assertIdentical = failUnlessIdentical = assertIs - def failIfIdentical(self, first, second, msg=None): + def assertIsNot(self, first, second, msg=None): """ Fail the test if :py:data:`first` is :py:data:`second`. This is an obect-identity-equality test, not an object equality @@ -254,7 +254,7 @@ class TestCase(TestCase): if first is second: raise self.failureException(msg or '%r is %r' % (first, second)) return first - assertNotIdentical = failIfIdentical + assertNotIdentical = failIfIdentical = assertIsNot def failUnlessRaises(self, exception, f, *args, **kwargs): |