From: Nick Coghlan <ncoghlan@gmail.com>
Date: Tue, 24 Jul 2007 13:07:38 +0000 (+0000)
Subject: Tweak runpy test to do a better job of confirming that sys has been manipulated correctly
X-Git-Tag: v2.6a1~1550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f82a03714ad08825bb5554988d9e2dd1fc30dd5;p=python

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

diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index e4ebc93bd7..31f4f85fc3 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)