From b4c8902a8727f99a4d361f6a3ebafa5002e56030 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 6 May 2012 11:50:00 +0200 Subject: [PATCH] #13183: backport fixes to test_pdb to 3.2 branch --- Lib/test/test_pdb.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 253fcaf36c8..d28b0425e51 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -601,6 +601,7 @@ class PdbTestCase(unittest.TestCase): filename = 'main.py' with open(filename, 'w') as f: f.write(textwrap.dedent(script)) + self.addCleanup(support.unlink, filename) cmd = [sys.executable, '-m', 'pdb', filename] stdout = stderr = None with subprocess.Popen(cmd, stdout=subprocess.PIPE, @@ -657,9 +658,11 @@ class PdbTestCase(unittest.TestCase): """ with open('bar.py', 'w') as f: f.write(textwrap.dedent(bar)) + self.addCleanup(support.unlink, 'bar.py') stdout, stderr = self.run_pdb(script, commands) - self.assertIn('main.py(5)foo()->None', stdout.split('\n')[-3], - 'Fail to step into the caller after a return') + self.assertTrue( + any('main.py(5)foo()->None' in l for l in stdout.splitlines()), + 'Fail to step into the caller after a return') def tearDown(self): support.unlink(support.TESTFN)