diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-08-21 05:07:35 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-08-21 05:07:35 (GMT) |
| commit | f9ed528fafafda147f20f345195ced23b141ace9 (patch) | |
| tree | cce1cb2ce72ad29b035969ddaf1d889a5eec35c6 /Lib/test/test_cmd_line_script.py | |
| parent | 49dcf9d858eaeebe687bfbdd36d2e579ec86b031 (diff) | |
| parent | 9c8aa9bffe755fe6126dc72dfd037c6b20e65906 (diff) | |
| download | cpython-f9ed528fafafda147f20f345195ced23b141ace9.zip cpython-f9ed528fafafda147f20f345195ced23b141ace9.tar.gz cpython-f9ed528fafafda147f20f345195ced23b141ace9.tar.bz2 | |
Issue #27487: Merge runpy warning from 3.5
Diffstat (limited to 'Lib/test/test_cmd_line_script.py')
| -rw-r--r-- | Lib/test/test_cmd_line_script.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 01fb7dc..6e0b669 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -425,8 +425,9 @@ class CmdLineTest(unittest.TestCase): # Exercise error reporting for various invalid package executions tests = ( ('builtins', br'No code object available'), - ('builtins.x', br'Error while finding spec.*AttributeError'), - ('builtins.x.y', br'Error while finding spec.*' + ('builtins.x', br'Error while finding module specification.*' + br'AttributeError'), + ('builtins.x.y', br'Error while finding module specification.*' br'ImportError.*No module named.*not a package'), ('os.path', br'loader.*cannot handle'), ('importlib', br'No module named.*' @@ -449,7 +450,8 @@ class CmdLineTest(unittest.TestCase): with open('test_pkg/__init__.pyc', 'wb'): pass err = self.check_dash_m_failure('test_pkg') - self.assertRegex(err, br'Error while finding spec.*' + self.assertRegex(err, + br'Error while finding module specification.*' br'ImportError.*bad magic number') self.assertNotIn(b'is a package', err) self.assertNotIn(b'Traceback', err) |