| author | John Beck <John.Beck@Oracle.COM> |
| Tue, 22 Dec 2015 07:57:25 -0800 | |
| changeset 5229 | b7b91ddbbdce |
| parent 3905 | 397b904fa22e |
| permissions | -rw-r--r-- |
|
3905
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch was developed in-house and has been submitted upstream: |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
http://bugs.python.org/issue23584 |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
5229
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
4 |
--- Python-3.4.4rc1/Lib/test/test_doctest.py.~1~ 2015-12-06 15:54:36.000000000 -0800 |
|
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
5 |
+++ Python-3.4.4rc1/Lib/test/test_doctest.py 2015-12-09 08:13:21.741427836 -0800 |
|
3905
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -2627,7 +2627,7 @@ |
|
5229
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
7 |
>>> with open(fn, 'wb') as f: |
|
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
8 |
... f.write(b'Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n') |
|
3905
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
35 |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
- >>> doctest.testfile(fn, False) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
+ >>> doctest.testfile(fn, False, verbose=False) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
TestResults(failed=0, attempted=1) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
>>> os.remove(fn) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
|
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
@@ -2637,7 +2637,7 @@ |
|
5229
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
16 |
>>> with open(fn, 'wb') as f: |
|
b7b91ddbbdce
22456127 Upgrade Python 3.4 line to 3.4.4
John Beck <John.Beck@Oracle.COM>
parents:
3905
diff
changeset
|
17 |
... f.write(b'Test:\n\n >>> x = 1 + 1\n\nDone.\n') |
|
3905
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
30 |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
- >>> doctest.testfile(fn, False) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
+ >>> doctest.testfile(fn, False, verbose=False) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
TestResults(failed=0, attempted=1) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
>>> os.remove(fn) |
|
397b904fa22e
20358297 Python 2.7 test_doctest fails in verbose mode
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |