summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2007-07-24 13:07:38 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2007-07-24 13:07:38 (GMT)
commit4f82a03714ad08825bb5554988d9e2dd1fc30dd5 (patch)
tree7ee54e584c9e6abe94988132df646e29e75dc43f
parentae21fc6d1fa52d6c26cca797cf1f88cd45f2f143 (diff)
downloadcpython-4f82a03714ad08825bb5554988d9e2dd1fc30dd5.zip
cpython-4f82a03714ad08825bb5554988d9e2dd1fc30dd5.tar.gz
cpython-4f82a03714ad08825bb5554988d9e2dd1fc30dd5.tar.bz2
Tweak runpy test to do a better job of confirming that sys has been manipulated correctly
-rw-r--r--Lib/test/test_runpy.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index e4ebc93..31f4f85 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -21,8 +21,9 @@ class RunModuleCodeTest(unittest.TestCase):
"# Check the sys module\n"
"import sys\n"
"run_argv0 = sys.argv[0]\n"
- "if __name__ in sys.modules:\n"
- " run_name = sys.modules[__name__].__name__\n"
+ "run_name_in_sys_modules = __name__ in sys.modules\n"
+ "if run_name_in_sys_modules:\n"
+ " module_in_sys_modules = globals() is sys.modules[__name__].__dict__\n"
"# Check nested operation\n"
"import runpy\n"
"nested = runpy._run_module_code('x=1\\n', mod_name='<run>',\n"
@@ -48,7 +49,8 @@ class RunModuleCodeTest(unittest.TestCase):
self.failUnless(d2["result"] == self.expected_result)
self.failUnless(d2["nested"]["x"] == 1)
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["run_argv0"] is file)
self.failUnless(d2["__loader__"] is loader)