From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 12 Sep 2020 06:43:27 +0000 (-0700)
Subject: bpo-41731: Make test_cmd_line_script pass with -vv (GH-22206)
X-Git-Tag: v3.8.6~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77901dc6c3d06dd31f6c84b2d3cb21dc26b1e351;p=thirdparty%2FPython%2Fcpython.git

bpo-41731: Make test_cmd_line_script pass with -vv (GH-22206)


Argument script_exec_args is usually an absolute file name,
but twice has form ['-m', 'module_name'].
(cherry picked from commit 7e711ead26fea6465e0ef2e3b8880b57ba8fc129)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
---

diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index f0bd013e5536..a4a868adb08b 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -143,7 +143,7 @@ class CmdLineTest(unittest.TestCase):
             *run_args, __isolated=False, __cwd=cwd, **env_vars
         )
         if verbose > 1:
-            print('Output from test script %r:' % script_exec_args)
+            print(f'Output from test script {script_exec_args!r:}')
             print(repr(err))
             print('Expected output: %r' % expected_msg)
         self.assertIn(expected_msg.encode('utf-8'), err)
diff --git a/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst b/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst
new file mode 100644
index 000000000000..e368a60f77b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst
@@ -0,0 +1 @@
+Make test_cmd_line_script pass with option '-vv'.