Commit e27b3608 authored by Nick Coghlan's avatar Nick Coghlan

Merge from 3.2

parents dea6c21a 10ac77d2
......@@ -242,7 +242,7 @@ class CmdLineTest(unittest.TestCase):
script_name = _make_test_script(pkg_dir, 'script')
rc, out, err = assert_python_ok('-m', 'test_pkg.script')
if verbose > 1:
print(data)
print(out)
expected = "init_argv0==%r" % '-m'
self.assertIn(expected.encode('utf-8'), out)
self._check_output(script_name, rc, out,
......
......@@ -1123,6 +1123,7 @@ Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
Jason Yeo
Bob Yodlowski
Danny Yoo
George Yoshida
......
......@@ -121,6 +121,9 @@ Library
Tests
-----
- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
message (Patch by Jason Yeo)
- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing
a test failure in test_ssl.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment