mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed bytes warnings when run tests with -vv.

Browse source
This commit is contained in:
Serhiy Storchaka 2015-03-25 01:34:03 +02:00
commit 09ce2786e4
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_cmd_line_script.py
View file

@ -114,7 +114,7 @@ class CmdLineTest(unittest.TestCase):
expected_loader): expected_loader):
if verbose > 1: if verbose > 1:
print("Output from test script %r:" % script_name) print("Output from test script %r:" % script_name)
print(data) print(repr(data))
self.assertEqual(exit_code, 0) self.assertEqual(exit_code, 0)
printed_loader = '__loader__==%a' % expected_loader printed_loader = '__loader__==%a' % expected_loader
printed_file = '__file__==%a' % expected_file printed_file = '__file__==%a' % expected_file
@ -153,7 +153,7 @@ class CmdLineTest(unittest.TestCase):
rc, out, err = assert_python_failure(*run_args) rc, out, err = assert_python_failure(*run_args)
if verbose > 1: if verbose > 1:
print('Output from test script %r:' % script_name) print('Output from test script %r:' % script_name)
print(err) print(repr(err))
print('Expected output: %r' % expected_msg) print('Expected output: %r' % expected_msg)
self.assertIn(expected_msg.encode('utf-8'), err) self.assertIn(expected_msg.encode('utf-8'), err)
@ -362,7 +362,7 @@ class CmdLineTest(unittest.TestCase):
script_name = _make_test_script(pkg_dir, 'script') script_name = _make_test_script(pkg_dir, 'script')
rc, out, err = assert_python_ok('-m', 'test_pkg.script', *example_args, __isolated=False) rc, out, err = assert_python_ok('-m', 'test_pkg.script', *example_args, __isolated=False)
if verbose > 1: if verbose > 1:
print(out) print(repr(out))
expected = "init_argv0==%r" % '-m' expected = "init_argv0==%r" % '-m'
self.assertIn(expected.encode('utf-8'), out) self.assertIn(expected.encode('utf-8'), out)
self._check_output(script_name, rc, out, self._check_output(script_name, rc, out,
@ -380,7 +380,7 @@ class CmdLineTest(unittest.TestCase):
'import sys; print("sys.path[0]==%r" % sys.path[0])', 'import sys; print("sys.path[0]==%r" % sys.path[0])',
__isolated=False) __isolated=False)
if verbose > 1: if verbose > 1:
print(out) print(repr(out))
expected = "sys.path[0]==%r" % '' expected = "sys.path[0]==%r" % ''
self.assertIn(expected.encode('utf-8'), out) self.assertIn(expected.encode('utf-8'), out)
@ -410,7 +410,7 @@ class CmdLineTest(unittest.TestCase):
"if __name__ == '__main__': raise ValueError") "if __name__ == '__main__': raise ValueError")
rc, out, err = assert_python_failure('-m', 'test_pkg.other', *example_args) rc, out, err = assert_python_failure('-m', 'test_pkg.other', *example_args)
if verbose > 1: if verbose > 1:
print(out) print(repr(out))
self.assertEqual(rc, 1) self.assertEqual(rc, 1)
def test_pep_409_verbiage(self): def test_pep_409_verbiage(self):

2
Lib/test/test_multiprocessing_main_handling.py
View file

@ -143,7 +143,7 @@ class MultiProcessingCmdLineMixin():
def _check_output(self, script_name, exit_code, out, err): def _check_output(self, script_name, exit_code, out, err):
if verbose > 1: if verbose > 1:
print("Output from test script %r:" % script_name) print("Output from test script %r:" % script_name)
print(out) print(repr(out))
self.assertEqual(exit_code, 0) self.assertEqual(exit_code, 0)
self.assertEqual(err.decode('utf-8'), '') self.assertEqual(err.decode('utf-8'), '')
expected_results = "%s -> [1, 4, 9]" % self.start_method expected_results = "%s -> [1, 4, 9]" % self.start_method