From 0e4f913da88791644150282e38ba21d1fca5fd91 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 15 Sep 2021 11:56:32 -0700 Subject: bpo-45208: Make test_pdb.test_checkline_is_not_executable() quiet (GH-28354) (GH-28363) test_pdb.test_checkline_is_not_executable() no longer writes output to stdout. Remove also unused variables 'f'. (cherry picked from commit e08e491a6ceea8ca105612df10147418c4e105b8) Co-authored-by: Victor Stinner --- Lib/test/test_pdb.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index a9afca8..d4c037d 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -11,7 +11,7 @@ import subprocess import textwrap import linecache -from contextlib import ExitStack +from contextlib import ExitStack, redirect_stdout from io import StringIO from test.support import os_helper # This little helper class is essential for testing pdb under doctest. @@ -1688,7 +1688,7 @@ def bœr(): os_helper.rmtree(module_name) init_file = module_name + '/__init__.py' os.mkdir(module_name) - with open(init_file, 'w') as f: + with open(init_file, 'w'): pass self.addCleanup(os_helper.rmtree, module_name) stdout, stderr = self._run_pdb(['-m', module_name], "") @@ -1701,7 +1701,7 @@ def bœr(): os_helper.rmtree(pkg_name) modpath = pkg_name + '/' + module_name os.makedirs(modpath) - with open(modpath + '/__init__.py', 'w') as f: + with open(modpath + '/__init__.py', 'w'): pass self.addCleanup(os_helper.rmtree, pkg_name) stdout, stderr = self._run_pdb(['-m', modpath.replace('/', '.')], "") @@ -1915,19 +1915,20 @@ class ChecklineTests(unittest.TestCase): self.assertEqual(db.checkline(os_helper.TESTFN, 1), 1) def test_checkline_is_not_executable(self): - with open(os_helper.TESTFN, "w") as f: - # Test for comments, docstrings and empty lines - s = textwrap.dedent(""" - # Comment - \"\"\" docstring \"\"\" - ''' docstring ''' + # Test for comments, docstrings and empty lines + s = textwrap.dedent(""" + # Comment + \"\"\" docstring \"\"\" + ''' docstring ''' - """) + """) + with open(os_helper.TESTFN, "w") as f: f.write(s) - db = pdb.Pdb() num_lines = len(s.splitlines()) + 2 # Test for EOF - for lineno in range(num_lines): - self.assertFalse(db.checkline(os_helper.TESTFN, lineno)) + with redirect_stdout(StringIO()): + db = pdb.Pdb() + for lineno in range(num_lines): + self.assertFalse(db.checkline(os_helper.TESTFN, lineno)) def load_tests(*args): -- cgit v0.12