mirror of
https://github.com/python/cpython.git
synced 2025-07-25 12:14:38 +00:00

Merged revisions 57392-57619 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines Bug #1011: fix rfc822.Message.getheader docs. ........ r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1006: port test_winreg to unittest. ........ r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines Fix #1012: wrong URL to :mod:`site` in install/index.rst. ........ r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1008: port test_signal to unittest. ........ r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_frozen to unittest. ........ r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines Document new utility functions in test_support. ........ r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines Remove test_rgbimg output file, there is no test_rgbimg.py. ........ r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines Remove output file for test_ossaudiodev, also properly close the dsp object. ........ r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev. ........ r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line Convert test_pkg to use unittest. ........ r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines Catch the correct errors. ........ r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_class to unittest. Patch #1671298. ........ r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line Make test_structmembers pass when run with regrtests's -R flag. ........ r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon) ........ r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line Revert compile.c changes that shouldn't have been included in previous checkin ........ r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line Fix bug 1764407 - the -i switch now does the right thing when using the -m switch ........ r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines Server-side SSL and certificate validation, by Bill Janssen. While cleaning up Bill's C style, I may have cleaned up some code he didn't touch as well (in _ssl.c). ........ r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines Try to get this to build with Visual Studio by moving all the variable declarations to the beginning of a scope. ........ r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line Fix test so it is skipped properly if there is no SSL support. ........ r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines Fix a few more variables to try to get this to compile with Visual Studio. ........ r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line Try to get this test to pass for systems that do not have SO_REUSEPORT ........ r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines keep setup.py from listing unneeded hash modules (_md5, _sha*) as missing when they were not built because _hashlib with openssl provided their functionality instead. don't build bsddb185 if bsddb was built. ........ r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line Fix typo in docstring (missing c in reacquire) ........ r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines Spell check (also americanify behaviour, it's almost 3 times as common) ........ r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines Reap children before the test starts so hopefully SocketServer won't find any old children left around which causes an exception in collect_children() and the test to fail. ........ r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line Fail gracefully if the cert files cannot be created ........ r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines Bill Janssen wrote: Here's a patch which makes test_ssl a better player in the buildbots environment. I deep-ended on "try-except-else" clauses. ........ r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line Get the test passing by commenting out some writes (should they be removed?) ........ r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines Catch IOError for when the device file doesn't exist or the user doesn't have permission to write to the device. ........ r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines Another patch from Bill Janssen that: 1) Fixes the bug that two class names are initial-lower-case. 2) Replaces the poll waiting for the server to become ready with a threading.Event signal. ........ r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line Stop using string.join (from the module) to ease upgrade to py3k ........ r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line Make a utility function for handling (printing) an error ........ r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines If we can't create a certificate, print a warning, but don't fail the test. Modified patch from what Bill Janssen sent on python-3000. ........ r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines Ignore test failures caused by 'resource temporarily unavailable' exceptions raised in the test server thread, since SimpleXMLRPCServer does not gracefully handle them. Changed number of requests handled by tests server thread to one (was 2) because no tests require more than one request. [GSoC - Alan McIntyre] ........ r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines > Regardless, building a fixed test certificate and checking it in sounds like > the better option. Then the openssl command in the test code can be turned > into a comment describing how the test data was pregenerated. Here's a patch that does that. Bill ........ r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines > Some of the code sets the error string in this directly before > returning NULL, and other pieces of the code call PySSL_SetError, > which creates the error string. I think some of the places which set > the string directly probably shouldn't; instead, they should call > PySSL_SetError to cons up the error name directly from the err code. > However, PySSL_SetError only works after the construction of an ssl > object, which means it can't be used there... I'll take a longer look > at it and see if there's a reasonable fix. Here's a patch which addresses this. It also fixes the indentation in PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning about one of the OpenSSL macros, and makes the namespace a bit more consistent. I've tested it on FC 7 and OS X 10.4. % ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl test_ssl beginning 6 repetitions 123456 ...... 1 test OK. [29244 refs] % [GvR: slightly edited to enforce 79-char line length, even if it required violating the style guide.] ........ r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines Patch 10124 by Bill Janssen, docs for the new ssl code. ........ r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines Patch # 1739906 by Christian Heimes -- add reduce to functools (importing it from __builtin__). ........ r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines News about functools.reduce. ........ r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines Document rev. 57574. ........ r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines Adding basic imputil documentation. ........ r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines Fix some glitches. ........ r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines TarFile.__init__() no longer fails if no name argument is passed and the fileobj argument has no usable name attribute (e.g. StringIO). (will backport to 2.5) ........ r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines Improve extended slicing support in builtin types and classes. Specifically: - Specialcase extended slices that amount to a shallow copy the same way as is done for simple slices, in the tuple, string and unicode case. - Specialcase step-1 extended slices to optimize the common case for all involved types. - For lists, allow extended slice assignment of differing lengths as long as the step is 1. (Previously, 'l[:2:1] = []' failed even though 'l[:2] = []' and 'l[:2:None] = []' do not.) - Implement extended slicing for buffer, array, structseq, mmap and UserString.UserString. - Implement slice-object support (but not non-step-1 slice assignment) for UserString.MutableString. - Add tests for all new functionality. ........
234 lines
8.8 KiB
Python
234 lines
8.8 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_code, _run_module_code, _run_module_as_main, 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_code(self):
|
|
saved_argv0 = sys.argv[0]
|
|
d = _run_code(self.test_source, {})
|
|
self.failUnless(d["result"] == self.expected_result)
|
|
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("run_name" not in d)
|
|
self.failUnless(sys.argv[0] is saved_argv0)
|
|
|
|
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]
|
|
d2 = _run_module_code(self.test_source,
|
|
d1,
|
|
name,
|
|
file,
|
|
loader)
|
|
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.failUnless(d2["__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)
|
|
self.failUnless(sys.argv[0] is saved_argv0)
|
|
self.failUnless(name 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()
|