mirror of
https://github.com/python/cpython.git
synced 2025-10-21 08:54:03 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r57227 | facundo.batista | 2007-08-20 17:16:21 -0700 (Mon, 20 Aug 2007) | 5 lines Catch ProtocolError exceptions and include the header information in test output (to make it easier to debug test failures caused by problems in the server). [GSoC - Alan McIntyre] ........ r57229 | mark.hammond | 2007-08-20 18:04:47 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57230 | mark.hammond | 2007-08-20 18:05:16 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57253 | georg.brandl | 2007-08-20 23:01:18 -0700 (Mon, 20 Aug 2007) | 2 lines Demand version 2.5.1 since 2.5 has a bug with codecs.open context managers. ........ r57254 | georg.brandl | 2007-08-20 23:03:43 -0700 (Mon, 20 Aug 2007) | 2 lines Revert accidental checkins from last commit. ........ r57255 | georg.brandl | 2007-08-20 23:07:08 -0700 (Mon, 20 Aug 2007) | 2 lines Bug #1777160: mention explicitly that e.g. -1**2 is -1. ........ r57256 | georg.brandl | 2007-08-20 23:12:19 -0700 (Mon, 20 Aug 2007) | 3 lines Bug #1777168: replace operator names "opa"... with "op1"... and mark everything up as literal, to enhance readability. ........ r57259 | facundo.batista | 2007-08-21 09:57:18 -0700 (Tue, 21 Aug 2007) | 8 lines Added test for behavior of operations on an unconnected SMTP object, and tests for NOOP, RSET, and VRFY. Corrected typo in a comment for testNonnumericPort. Added a check for constructing SMTP objects when non-numeric ports are included in the host name. Derived a server from SMTPServer to test various ESMTP/SMTP capabilities. Check that a second HELO to DebuggingServer returns an error. [GSoC - Alan McIntyre] ........ r57279 | skip.montanaro | 2007-08-22 12:02:16 -0700 (Wed, 22 Aug 2007) | 2 lines Note that BeOS is unsupported as of Python 2.6. ........ r57280 | skip.montanaro | 2007-08-22 12:05:21 -0700 (Wed, 22 Aug 2007) | 1 line whoops - need to check in configure as well ........ r57284 | alex.martelli | 2007-08-22 14:14:17 -0700 (Wed, 22 Aug 2007) | 5 lines Fix compile.c so that it records 0.0 and -0.0 as separate constants in a code object's co_consts tuple; add a test to show that the previous behavior (where these two constants were "collapsed" into one) causes serious malfunctioning. ........ r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines stop leaving log.0000001 __db.00* and xxx.db turds in developer sandboxes when bsddb3 tests are run. ........ r57301 | jeffrey.yasskin | 2007-08-22 16:14:27 -0700 (Wed, 22 Aug 2007) | 3 lines When setup.py fails to find the necessary bits to build some modules, have it print a slightly more informative message. ........ r57320 | brett.cannon | 2007-08-23 07:53:17 -0700 (Thu, 23 Aug 2007) | 2 lines Make test_runpy re-entrant. ........ r57324 | georg.brandl | 2007-08-23 10:54:11 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1768121: fix wrong/missing opcode docs. ........ r57326 | georg.brandl | 2007-08-23 10:57:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1766421: "return code" vs. "status code". ........ r57328 | georg.brandl | 2007-08-23 11:08:06 -0700 (Thu, 23 Aug 2007) | 2 lines Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYNAMIC_LOADING is not defined. ........ r57331 | georg.brandl | 2007-08-23 11:11:33 -0700 (Thu, 23 Aug 2007) | 2 lines Use try-except-finally in contextlib. ........ r57343 | georg.brandl | 2007-08-23 13:35:00 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1697820: document that the old slice protocol is still used by builtin types. ........ r57345 | georg.brandl | 2007-08-23 13:40:01 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1573854: fix docs for sqlite3 cursor rowcount attr. ........ r57347 | georg.brandl | 2007-08-23 13:50:23 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1694833: fix imp.find_module() docs wrt. packages. ........ r57348 | georg.brandl | 2007-08-23 13:53:28 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1594966: fix misleading usage example ........ r57349 | georg.brandl | 2007-08-23 13:55:44 -0700 (Thu, 23 Aug 2007) | 2 lines Clarify wording a bit. ........ r57351 | georg.brandl | 2007-08-23 14:18:44 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1752332: httplib no longer uses socket.getaddrinfo(). ........ r57352 | georg.brandl | 2007-08-23 14:21:36 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1734111: document struct.Struct.size. ........ r57353 | georg.brandl | 2007-08-23 14:27:57 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1688564: document os.path.join's absolute path behavior in the docstring. ........ r57354 | georg.brandl | 2007-08-23 14:36:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1625381: clarify match vs search introduction. ........ r57355 | georg.brandl | 2007-08-23 14:42:54 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1758696: more info about descriptors. ........ r57357 | georg.brandl | 2007-08-23 14:55:57 -0700 (Thu, 23 Aug 2007) | 2 lines Patch #1779550: remove redundant code in logging. ........ r57378 | gregory.p.smith | 2007-08-23 22:11:38 -0700 (Thu, 23 Aug 2007) | 2 lines Fix bug 1725856. ........ r57382 | georg.brandl | 2007-08-23 23:10:01 -0700 (Thu, 23 Aug 2007) | 2 lines uuid creation is now threadsafe, backport from py3k rev. 57375. ........ r57389 | georg.brandl | 2007-08-24 04:47:37 -0700 (Fri, 24 Aug 2007) | 2 lines Bug #1765375: fix stripping of unwanted LDFLAGS. ........ r57391 | guido.van.rossum | 2007-08-24 07:53:14 -0700 (Fri, 24 Aug 2007) | 2 lines Fix silly typo in test name. ........
244 lines
9.2 KiB
Python
244 lines
9.2 KiB
Python
# Test the runpy module
|
|
import unittest
|
|
import os
|
|
import os.path
|
|
import sys
|
|
import tempfile
|
|
from test.test_support import verbose, run_unittest, forget
|
|
from runpy import _run_module_code, run_module
|
|
|
|
# Set up the test code and expected results
|
|
|
|
class RunModuleCodeTest(unittest.TestCase):
|
|
|
|
expected_result = ["Top level assignment", "Lower level reference"]
|
|
test_source = (
|
|
"# Check basic code execution\n"
|
|
"result = ['Top level assignment']\n"
|
|
"def f():\n"
|
|
" result.append('Lower level reference')\n"
|
|
"f()\n"
|
|
"# Check the sys module\n"
|
|
"import sys\n"
|
|
"run_argv0 = sys.argv[0]\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"
|
|
)
|
|
|
|
|
|
def test_run_module_code(self):
|
|
initial = object()
|
|
name = "<Nonsense>"
|
|
file = "Some other nonsense"
|
|
loader = "Now you're just being silly"
|
|
d1 = dict(initial=initial)
|
|
saved_argv0 = sys.argv[0]
|
|
try:
|
|
d2 = _run_module_code(self.test_source,
|
|
d1,
|
|
name,
|
|
file,
|
|
loader,
|
|
alter_sys=True)
|
|
self.failUnless("result" not in d1)
|
|
self.failUnless(d2["initial"] is initial)
|
|
self.assertEqual(d2["result"], self.expected_result)
|
|
self.assertEqual(d2["nested"]["x"], 1)
|
|
self.assertEqual(d2["nested"]["__name__"], "<run>")
|
|
self.failUnless(d2["__name__"] is name)
|
|
self.failUnless(d2["__file__"] is file)
|
|
self.failUnless(d2["__loader__"] is loader)
|
|
self.failUnless(d2["run_argv0"] is file)
|
|
self.failUnless(d2["run_name_in_sys_modules"])
|
|
self.failUnless(d2["module_in_sys_modules"])
|
|
self.failUnless(sys.argv[0] is not saved_argv0)
|
|
self.failUnless(name in sys.modules)
|
|
finally:
|
|
sys.argv[0] = saved_argv0
|
|
if name in sys.modules:
|
|
del sys.modules[name]
|
|
|
|
def test_run_module_code_defaults(self):
|
|
saved_argv0 = sys.argv[0]
|
|
d = _run_module_code(self.test_source)
|
|
self.assertEqual(d["result"], self.expected_result)
|
|
self.failUnless(d["nested"]["x"] == 1)
|
|
self.failUnless(d["nested"]["__name__"] == "<run>")
|
|
self.failUnless(d["__name__"] is None)
|
|
self.failUnless(d["__file__"] is None)
|
|
self.failUnless(d["__loader__"] is None)
|
|
self.failUnless(d["run_argv0"] is saved_argv0)
|
|
self.failUnless(not d["run_name_in_sys_modules"])
|
|
self.failUnless(sys.argv[0] is saved_argv0)
|
|
self.failUnless(None not in sys.modules)
|
|
|
|
class RunModuleTest(unittest.TestCase):
|
|
|
|
def expect_import_error(self, mod_name):
|
|
try:
|
|
run_module(mod_name)
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
self.fail("Expected import error for " + mod_name)
|
|
|
|
def test_invalid_names(self):
|
|
# Builtin module
|
|
self.expect_import_error("sys")
|
|
# Non-existent modules
|
|
self.expect_import_error("sys.imp.eric")
|
|
self.expect_import_error("os.path.half")
|
|
self.expect_import_error("a.bee")
|
|
self.expect_import_error(".howard")
|
|
self.expect_import_error("..eaten")
|
|
# Package
|
|
self.expect_import_error("logging")
|
|
|
|
def test_library_module(self):
|
|
run_module("runpy")
|
|
|
|
def _add_pkg_dir(self, pkg_dir):
|
|
os.mkdir(pkg_dir)
|
|
pkg_fname = os.path.join(pkg_dir, "__init__.py")
|
|
pkg_file = open(pkg_fname, "w")
|
|
pkg_file.close()
|
|
return pkg_fname
|
|
|
|
def _make_pkg(self, source, depth):
|
|
pkg_name = "__runpy_pkg__"
|
|
test_fname = "runpy_test.py"
|
|
pkg_dir = sub_dir = tempfile.mkdtemp()
|
|
if verbose: print(" Package tree in:", sub_dir)
|
|
sys.path.insert(0, pkg_dir)
|
|
if verbose: print(" Updated sys.path:", sys.path[0])
|
|
for i in range(depth):
|
|
sub_dir = os.path.join(sub_dir, pkg_name)
|
|
pkg_fname = self._add_pkg_dir(sub_dir)
|
|
if verbose: print(" Next level in:", sub_dir)
|
|
if verbose: print(" Created:", pkg_fname)
|
|
mod_fname = os.path.join(sub_dir, test_fname)
|
|
mod_file = open(mod_fname, "w")
|
|
mod_file.write(source)
|
|
mod_file.close()
|
|
if verbose: print(" Created:", mod_fname)
|
|
mod_name = (pkg_name+".")*depth + "runpy_test"
|
|
return pkg_dir, mod_fname, mod_name
|
|
|
|
def _del_pkg(self, top, depth, mod_name):
|
|
for entry in list(sys.modules):
|
|
if entry.startswith("__runpy_pkg__"):
|
|
del sys.modules[entry]
|
|
if verbose: print(" Removed sys.modules entries")
|
|
del sys.path[0]
|
|
if verbose: print(" Removed sys.path entry")
|
|
for root, dirs, files in os.walk(top, topdown=False):
|
|
for name in files:
|
|
try:
|
|
os.remove(os.path.join(root, name))
|
|
except OSError as ex:
|
|
if verbose: print(ex) # Persist with cleaning up
|
|
for name in dirs:
|
|
fullname = os.path.join(root, name)
|
|
try:
|
|
os.rmdir(fullname)
|
|
except OSError as ex:
|
|
if verbose: print(ex) # Persist with cleaning up
|
|
try:
|
|
os.rmdir(top)
|
|
if verbose: print(" Removed package tree")
|
|
except OSError as ex:
|
|
if verbose: print(ex) # Persist with cleaning up
|
|
|
|
def _check_module(self, depth):
|
|
pkg_dir, mod_fname, mod_name = (
|
|
self._make_pkg("x=1\n", depth))
|
|
forget(mod_name)
|
|
try:
|
|
if verbose: print("Running from source:", mod_name)
|
|
d1 = run_module(mod_name) # Read from source
|
|
self.failUnless("x" in d1)
|
|
self.assertEqual(d1["x"], 1)
|
|
del d1 # Ensure __loader__ entry doesn't keep file open
|
|
__import__(mod_name)
|
|
os.remove(mod_fname)
|
|
if verbose: print("Running from compiled:", mod_name)
|
|
d2 = run_module(mod_name) # Read from bytecode
|
|
self.failUnless("x" in d2)
|
|
self.assertEqual(d2["x"], 1)
|
|
del d2 # Ensure __loader__ entry doesn't keep file open
|
|
finally:
|
|
self._del_pkg(pkg_dir, depth, mod_name)
|
|
if verbose: print("Module executed successfully")
|
|
|
|
def _add_relative_modules(self, base_dir, depth):
|
|
if depth <= 1:
|
|
raise ValueError("Relative module test needs depth > 1")
|
|
pkg_name = "__runpy_pkg__"
|
|
module_dir = base_dir
|
|
for i in range(depth):
|
|
parent_dir = module_dir
|
|
module_dir = os.path.join(module_dir, pkg_name)
|
|
# Add sibling module
|
|
sibling_fname = os.path.join(module_dir, "sibling.py")
|
|
sibling_file = open(sibling_fname, "w")
|
|
sibling_file.close()
|
|
if verbose: print(" Added sibling module:", sibling_fname)
|
|
# Add nephew module
|
|
uncle_dir = os.path.join(parent_dir, "uncle")
|
|
self._add_pkg_dir(uncle_dir)
|
|
if verbose: print(" Added uncle package:", uncle_dir)
|
|
cousin_dir = os.path.join(uncle_dir, "cousin")
|
|
self._add_pkg_dir(cousin_dir)
|
|
if verbose: print(" Added cousin package:", cousin_dir)
|
|
nephew_fname = os.path.join(cousin_dir, "nephew.py")
|
|
nephew_file = open(nephew_fname, "w")
|
|
nephew_file.close()
|
|
if verbose: print(" Added nephew module:", nephew_fname)
|
|
|
|
def _check_relative_imports(self, depth, run_name=None):
|
|
contents = """\
|
|
from __future__ import absolute_import
|
|
from . import sibling
|
|
from ..uncle.cousin import nephew
|
|
"""
|
|
pkg_dir, mod_fname, mod_name = (
|
|
self._make_pkg(contents, depth))
|
|
try:
|
|
self._add_relative_modules(pkg_dir, depth)
|
|
if verbose: print("Running from source:", mod_name)
|
|
d1 = run_module(mod_name) # Read from source
|
|
self.failUnless("sibling" in d1)
|
|
self.failUnless("nephew" in d1)
|
|
del d1 # Ensure __loader__ entry doesn't keep file open
|
|
__import__(mod_name)
|
|
os.remove(mod_fname)
|
|
if verbose: print("Running from compiled:", mod_name)
|
|
d2 = run_module(mod_name) # Read from bytecode
|
|
self.failUnless("sibling" in d2)
|
|
self.failUnless("nephew" in d2)
|
|
del d2 # Ensure __loader__ entry doesn't keep file open
|
|
finally:
|
|
self._del_pkg(pkg_dir, depth, mod_name)
|
|
if verbose: print("Module executed successfully")
|
|
|
|
def test_run_module(self):
|
|
for depth in range(4):
|
|
if verbose: print("Testing package depth:", depth)
|
|
self._check_module(depth)
|
|
|
|
def test_explicit_relative_import(self):
|
|
for depth in range(2, 5):
|
|
if verbose: print("Testing relative imports at depth:", depth)
|
|
self._check_relative_imports(depth)
|
|
|
|
|
|
def test_main():
|
|
run_unittest(RunModuleCodeTest)
|
|
run_unittest(RunModuleTest)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|