Merge 3.6 (test_regrtest)

This commit is contained in:
Victor Stinner 2016-09-19 00:11:58 +02:00
commit f04ce5d6f1
1 changed files with 2 additions and 5 deletions

View File

@ -772,14 +772,11 @@ class ArgsTestCase(BaseTestCase):
self.check_line(output, re.escape(line)) self.check_line(output, re.escape(line))
line2 = '%s leaked [1, 1, 1] file descriptors, sum=3\n' % test 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: with open(filename) as fp:
reflog = fp.read() reflog = fp.read()
if hasattr(sys, 'getcounts'): self.assertIn(line2, reflog)
# Types are immportal if COUNT_ALLOCS is defined
reflog = reflog.splitlines(True)[-1]
self.assertEqual(reflog, line2)
def test_list_tests(self): def test_list_tests(self):
# test --list-tests # test --list-tests