diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-11 10:05:37 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-11 10:05:37 (GMT) |
| commit | b2855ccd09e8e4d6629d83361016f7fdc51c75a5 (patch) | |
| tree | 8d7bc6cb7f57f386049249e024a6e7f8356c1952 | |
| parent | 4a0b6f70f62baef9eb02b5a1ea4748c57d442d99 (diff) | |
| parent | d51914c6c1009efaa898824170e2702541d80009 (diff) | |
| download | cpython-b2855ccd09e8e4d6629d83361016f7fdc51c75a5.zip cpython-b2855ccd09e8e4d6629d83361016f7fdc51c75a5.tar.gz cpython-b2855ccd09e8e4d6629d83361016f7fdc51c75a5.tar.bz2 | |
#18663: merge with 3.3.
| -rw-r--r-- | Doc/library/unittest.rst | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/test_assertions.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 6c9f2f1..66e427a 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -1077,7 +1077,7 @@ Test cases like the :func:`round` function) and not *significant digits*. If *delta* is supplied instead of *places* then the difference - between *first* and *second* must be less (or more) than *delta*. + between *first* and *second* must be less or equal to (or greater than) *delta*. Supplying both *delta* and *places* raises a ``TypeError``. diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py index d43fe5a..7931cad 100644 --- a/Lib/unittest/test/test_assertions.py +++ b/Lib/unittest/test/test_assertions.py @@ -34,6 +34,10 @@ class Test_Assertions(unittest.TestCase): self.assertNotAlmostEqual(1.1, 1.0, delta=0.05) self.assertNotAlmostEqual(1.0, 1.1, delta=0.05) + self.assertAlmostEqual(1.0, 1.0, delta=0.5) + self.assertRaises(self.failureException, self.assertNotAlmostEqual, + 1.0, 1.0, delta=0.5) + self.assertRaises(self.failureException, self.assertAlmostEqual, 1.1, 1.0, delta=0.05) self.assertRaises(self.failureException, self.assertNotAlmostEqual, |