changeset: 76470:ff6593aa8376 parent: 76468:4a12e8d32ac6 parent: 76469:22f0044ea366 user: Nick Coghlan date: Sun Apr 22 17:16:39 2012 +1000 files: Doc/library/http.cookies.rst Misc/NEWS description: Resolve #14026 (Merge from 3.2) diff -r 4a12e8d32ac6 -r ff6593aa8376 Lib/test/test_cmd_line_script.py --- a/Lib/test/test_cmd_line_script.py Sun Apr 22 02:08:59 2012 -0400 +++ b/Lib/test/test_cmd_line_script.py Sun Apr 22 17:16:39 2012 +1000 @@ -13,6 +13,8 @@ verbose = support.verbose +example_args = ['test1', 'test2', 'test3'] + test_source = """\ # Script may be run with optimisation enabled, so don't rely on assert # statements being executed @@ -36,6 +38,9 @@ # Check the sys module import sys assertIdentical(globals(), sys.modules[__name__].__dict__) +from test import test_cmd_line_script +example_args_list = test_cmd_line_script.example_args +assertEqual(sys.argv[1:], example_args_list) print('sys.argv[0]==%a' % sys.argv[0]) print('sys.path[0]==%a' % sys.path[0]) # Check the working directory @@ -100,7 +105,7 @@ *cmd_line_switches): if not __debug__: cmd_line_switches += ('-' + 'O' * sys.flags.optimize,) - run_args = cmd_line_switches + (script_name,) + run_args = cmd_line_switches + (script_name,) + tuple(example_args) rc, out, err = assert_python_ok(*run_args) self._check_output(script_name, rc, out + err, expected_file, expected_argv0, expected_path0, expected_package) @@ -240,7 +245,7 @@ pkg_dir = os.path.join(script_dir, 'test_pkg') make_pkg(pkg_dir, "import sys; print('init_argv0==%r' % sys.argv[0])") script_name = _make_test_script(pkg_dir, 'script') - rc, out, err = assert_python_ok('-m', 'test_pkg.script') + rc, out, err = assert_python_ok('-m', 'test_pkg.script', *example_args) if verbose> 1: print(out) expected = "init_argv0==%r" % '-m' @@ -270,7 +275,7 @@ with support.temp_cwd(path=script_dir): with open("-m", "w") as f: f.write("data") - rc, out, err = assert_python_ok('-m', 'other') + rc, out, err = assert_python_ok('-m', 'other', *example_args) self._check_output(script_name, rc, out, script_name, script_name, '', '') diff -r 4a12e8d32ac6 -r ff6593aa8376 Misc/NEWS --- a/Misc/NEWS Sun Apr 22 02:08:59 2012 -0400 +++ b/Misc/NEWS Sun Apr 22 17:16:39 2012 +1000 @@ -146,6 +146,9 @@ Tests ----- +- Issue #14026: In test_cmd_line_script, check that sys.argv is populated + correctly for the various invocation approaches (Patch by Jason Yeo) + - Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging message (Patch by Jason Yeo)