summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_cmd_line_script.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-08-21 04:07:58 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-08-21 04:07:58 (GMT)
commit9c8aa9bffe755fe6126dc72dfd037c6b20e65906 (patch)
tree27f0bb6088bde14cd358eef389833b0c3d0fe56f /Lib/test/test_cmd_line_script.py
parent9f957705d66bb7501d5590520778183217c301c9 (diff)
downloadcpython-9c8aa9bffe755fe6126dc72dfd037c6b20e65906.zip
cpython-9c8aa9bffe755fe6126dc72dfd037c6b20e65906.tar.gz
cpython-9c8aa9bffe755fe6126dc72dfd037c6b20e65906.tar.bz2
Issue #27487: Warn if submodule already imported before runpy execution
Also try to clarify the find_spec() error message.
Diffstat (limited to 'Lib/test/test_cmd_line_script.py')
-rw-r--r--Lib/test/test_cmd_line_script.py8
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 b2be9b1..befe0e4 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -426,8 +426,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.*'
@@ -450,7 +451,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)