Commit 4f82a037 authored by Nick Coghlan's avatar Nick Coghlan

Tweak runpy test to do a better job of confirming that sys has been manipulated correctly

parent ae21fc6d
...@@ -21,8 +21,9 @@ class RunModuleCodeTest(unittest.TestCase): ...@@ -21,8 +21,9 @@ class RunModuleCodeTest(unittest.TestCase):
"# Check the sys module\n" "# Check the sys module\n"
"import sys\n" "import sys\n"
"run_argv0 = sys.argv[0]\n" "run_argv0 = sys.argv[0]\n"
"if __name__ in sys.modules:\n" "run_name_in_sys_modules = __name__ in sys.modules\n"
" run_name = sys.modules[__name__].__name__\n" "if run_name_in_sys_modules:\n"
" module_in_sys_modules = globals() is sys.modules[__name__].__dict__\n"
"# Check nested operation\n" "# Check nested operation\n"
"import runpy\n" "import runpy\n"
"nested = runpy._run_module_code('x=1\\n', mod_name='<run>',\n" "nested = runpy._run_module_code('x=1\\n', mod_name='<run>',\n"
...@@ -48,7 +49,8 @@ class RunModuleCodeTest(unittest.TestCase): ...@@ -48,7 +49,8 @@ class RunModuleCodeTest(unittest.TestCase):
self.failUnless(d2["result"] == self.expected_result) self.failUnless(d2["result"] == self.expected_result)
self.failUnless(d2["nested"]["x"] == 1) self.failUnless(d2["nested"]["x"] == 1)
self.failUnless(d2["__name__"] is name) self.failUnless(d2["__name__"] is name)
self.failUnless(d2["run_name"] is name) self.failUnless(d2["run_name_in_sys_modules"])
self.failUnless(d2["module_in_sys_modules"])
self.failUnless(d2["__file__"] is file) self.failUnless(d2["__file__"] is file)
self.failUnless(d2["run_argv0"] is file) self.failUnless(d2["run_argv0"] is file)
self.failUnless(d2["__loader__"] is loader) self.failUnless(d2["__loader__"] is loader)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment