#13183: backport fixes to test_pdb to 3.2 branch
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 253fcaf..d28b042 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -601,6 +601,7 @@
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 @@
"""
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)