diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 20:59:24 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 20:59:24 (GMT) |
commit | b19f43dbf059c46aca0e416bedb43c65c511f42b (patch) | |
tree | dda0ee34da6c4e0d2d07e188cb845bcdd7b4ef6c /Lib/test/support.py | |
parent | e96159335f6bb26615b57f880bf90440ed0123e4 (diff) | |
download | cpython-b19f43dbf059c46aca0e416bedb43c65c511f42b.zip cpython-b19f43dbf059c46aca0e416bedb43c65c511f42b.tar.gz cpython-b19f43dbf059c46aca0e416bedb43c65c511f42b.tar.bz2 |
Merged revisions 77729 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77729 | ezio.melotti | 2010-01-24 22:48:35 +0200 (Sun, 24 Jan 2010) | 1 line
remove archaic functions from test_support
........
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r-- | Lib/test/support.py | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 7b0241a..8115020 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -21,8 +21,8 @@ __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module", "verbose", "use_resources", "max_memuse", "record_original_stdout", "get_original_stdout", "unload", "unlink", "rmtree", "forget", "is_resource_enabled", "requires", "find_unused_port", "bind_port", - "fcmp", "is_jython", "TESTFN", "HOST", "FUZZ", "findfile", "verify", - "vereq", "sortdict", "check_syntax_error", "open_urlresource", + "fcmp", "is_jython", "TESTFN", "HOST", "FUZZ", "findfile", + "sortdict", "check_syntax_error", "open_urlresource", "check_warnings", "CleanImport", "EnvironmentVarGuard", "TransientResource", "captured_output", "captured_stdout", "time_out", "socket_peer_reset", "ioerror_peer_reset", @@ -400,30 +400,6 @@ def findfile(file, here=__file__): if os.path.exists(fn): return fn return file -def verify(condition, reason='test failed'): - """Verify that condition is true. If not, raise TestFailed. - - The optional argument reason can be given to provide - a better error text. - """ - - if not condition: - raise TestFailed(reason) - -def vereq(a, b): - """Raise TestFailed if a == b is false. - - This is better than verify(a == b) because, in case of failure, the - error message incorporates repr(a) and repr(b) so you can see the - inputs. - - Note that "not (a == b)" isn't necessarily the same as "a != b"; the - former is tested. - """ - - if not (a == b): - raise TestFailed("%r == %r" % (a, b)) - def sortdict(dict): "Like repr(dict), but in sorted order." items = sorted(dict.items()) |