diff options
| author | Guido van Rossum <guido@python.org> | 2007-11-19 18:03:44 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-11-19 18:03:44 (GMT) |
| commit | 87c0f1d1c95eb1766a1340cd100533dfd7a86d52 (patch) | |
| tree | 76c3bee37e7effe5933d830f6fd0cc4ce15c9afc /Lib/test/test_cmd_line_script.py | |
| parent | 87afcbfe549bce674c52b0163bcf4dab6eea616e (diff) | |
| download | cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.zip cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.tar.gz cpython-87c0f1d1c95eb1766a1340cd100533dfd7a86d52.tar.bz2 | |
Merged revisions 59041-59055 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59044 | neal.norwitz | 2007-11-18 17:46:20 -0800 (Sun, 18 Nov 2007) | 1 line
Use a slightly more recent version than 1.5.2b2.
........
r59047 | walter.doerwald | 2007-11-19 04:14:05 -0800 (Mon, 19 Nov 2007) | 2 lines
Fix typo in comment.
........
r59049 | walter.doerwald | 2007-11-19 04:41:10 -0800 (Mon, 19 Nov 2007) | 4 lines
Fix for #1444: utf_8_sig.StreamReader was (indirectly through decode())
calling codecs.utf_8_decode() with final==True, which falled with incomplete
byte sequences. Fix and test by James G. Sack.
........
r59051 | nick.coghlan | 2007-11-19 05:56:27 -0800 (Mon, 19 Nov 2007) | 1 line
Enable some test_cmd_line_script debugging output to investigate failure on Mac OSX buildbot
........
r59053 | facundo.batista | 2007-11-19 08:30:24 -0800 (Mon, 19 Nov 2007) | 3 lines
Fixed detail in add_type() explanation (issue 1463).
........
r59054 | guido.van.rossum | 2007-11-19 09:35:24 -0800 (Mon, 19 Nov 2007) | 2 lines
Make this work stand-alone, too.
........
r59055 | guido.van.rossum | 2007-11-19 09:50:22 -0800 (Mon, 19 Nov 2007) | 3 lines
Fix the OSX failures in this test -- they were due to /tmp being a symlink
to /private/tmp. Adding a call to os.path.realpath() to temp_dir() fixed it.
........
Diffstat (limited to 'Lib/test/test_cmd_line_script.py')
| -rw-r--r-- | Lib/test/test_cmd_line_script.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 3c6e4a0..dcb768f 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -29,6 +29,7 @@ def _run_python(*args): @contextlib.contextmanager def temp_dir(): dirname = tempfile.mkdtemp() + dirname = os.path.realpath(dirname) try: yield dirname finally: @@ -82,7 +83,7 @@ def _make_test_zip(zip_dir, zip_basename, script_name): zip_file.close() # if verbose: # zip_file = zipfile.ZipFile(zip_name, 'r') - # print "Contents of %r:" % zip_name + # print("Contents of %r:" % zip_name) # zip_file.printdir() # zip_file.close() return zip_name @@ -90,9 +91,9 @@ def _make_test_zip(zip_dir, zip_basename, script_name): class CmdLineTest(unittest.TestCase): def _check_script(self, script_name, expected_file, expected_argv0): exit_code, data = _run_python(script_name) - # if verbose: - # print "Output from test script %r:" % script_name - # print data + if verbose: + print("Output from test script %r:" % script_name) + print(data) self.assertEqual(exit_code, 0, data) printed_file = '__file__==%r' % expected_file printed_argv0 = 'sys.argv[0]==%r' % expected_argv0 |