[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6 (test_regrtest)
victor.stinner
python-checkins at python.org
Sun Sep 18 18:13:32 EDT 2016
https://hg.python.org/cpython/rev/a26dde410502
changeset: 103931:a26dde410502
parent: 103929:7372c042e9a1
parent: 103930:91285b24f1c2
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Sep 19 00:11:58 2016 +0200
summary:
Merge 3.6 (test_regrtest)
files:
Lib/test/test_regrtest.py | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -772,14 +772,11 @@
self.check_line(output, re.escape(line))
line2 = '%s leaked [1, 1, 1] file descriptors, sum=3\n' % test
- self.check_line(output, re.escape(line2))
+ self.assertIn(line2, output)
with open(filename) as fp:
reflog = fp.read()
- if hasattr(sys, 'getcounts'):
- # Types are immportal if COUNT_ALLOCS is defined
- reflog = reflog.splitlines(True)[-1]
- self.assertEqual(reflog, line2)
+ self.assertIn(line2, reflog)
def test_list_tests(self):
# test --list-tests
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list