Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
b2855ccd
Commit
b2855ccd
authored
Aug 11, 2013
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Plain Diff
#18663: merge with 3.3.
parents
4a0b6f70
d51914c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Doc/library/unittest.rst
Doc/library/unittest.rst
+1
-1
Lib/unittest/test/test_assertions.py
Lib/unittest/test/test_assertions.py
+4
-0
No files found.
Doc/library/unittest.rst
View file @
b2855ccd
...
@@ -1077,7 +1077,7 @@ Test cases
...
@@ -1077,7 +1077,7 @@ Test cases
like the :func:`round` function) and not *significant digits*.
like the :func:`round` function) and not *significant digits*.
If *delta* is supplied instead of *places* then the difference
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``.
Supplying both *delta* and *places* raises a ``TypeError``.
...
...
Lib/unittest/test/test_assertions.py
View file @
b2855ccd
...
@@ -34,6 +34,10 @@ class Test_Assertions(unittest.TestCase):
...
@@ -34,6 +34,10 @@ class Test_Assertions(unittest.TestCase):
self
.
assertNotAlmostEqual
(
1.1
,
1.0
,
delta
=
0.05
)
self
.
assertNotAlmostEqual
(
1.1
,
1.0
,
delta
=
0.05
)
self
.
assertNotAlmostEqual
(
1.0
,
1.1
,
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
,
self
.
assertRaises
(
self
.
failureException
,
self
.
assertAlmostEqual
,
1.1
,
1.0
,
delta
=
0.05
)
1.1
,
1.0
,
delta
=
0.05
)
self
.
assertRaises
(
self
.
failureException
,
self
.
assertNotAlmostEqual
,
self
.
assertRaises
(
self
.
failureException
,
self
.
assertNotAlmostEqual
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment