-else: # we're the main program
- # NOTE
- # Why do we do this in such a convoluted way? Because if you run
- # wvtest.py as a main program and it imports your test files, then
- # those test files will try to import the wvtest module recursively.
- # That actually *works* fine, because we don't run this main program
- # when we're imported as a module. But you end up with two separate
- # wvtest modules, the one that gets imported, and the one that's the
- # main program. Each of them would have duplicated global variables
- # (most importantly, wvtest._registered), and so screwy things could
- # happen. Thus, we make the main program module *totally* different
- # from the imported module. Then we import wvtest (the module) into
- # wvtest (the main program) here and make sure to refer to the right
- # versions of global variables.
- #
- # All this is done just so that wvtest.py can be a single file that's
- # easy to import into your own applications.
- import wvtest
-
- def _runtest(modname, fname, f):
+ def wvfailure_count():
+ return _fails
+
+ def _check_unfinished():
+ if _registered:
+ for func in _registered:
+ print 'WARNING: not run: %r' % (func,)
+ WVFAIL('wvtest_main() not called')
+ if _fails:
+ sys.exit(1)
+
+ atexit.register(_check_unfinished)
+
+
+def _run_in_chdir(path, func, *args, **kwargs):
+ oldwd = os.getcwd()
+ oldpath = sys.path
+ try:
+ os.chdir(path)
+ sys.path += [path, os.path.split(path)[0]]
+ return func(*args, **kwargs)
+ finally:
+ os.chdir(oldwd)
+ sys.path = oldpath
+
+
+if sys.version_info >= (2,6,0):
+ _relpath = os.path.relpath;
+else:
+ # Implementation for Python 2.5, taken from CPython (tag v2.6,
+ # file Lib/posixpath.py, hg-commit 95fff5a6a276). Update
+ # ./LICENSE When this code is eventually removed.
+ def _relpath(path, start=os.path.curdir):
+ if not path:
+ raise ValueError("no path specified")
+
+ start_list = os.path.abspath(start).split(os.path.sep)
+ path_list = os.path.abspath(path).split(os.path.sep)
+
+ # Work out how much of the filepath is shared by start and path.
+ i = len(os.path.commonprefix([start_list, path_list]))
+
+ rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:]
+ if not rel_list:
+ return curdir
+ return os.path.join(*rel_list)
+
+
+def _runtest(fname, f):
+ mod = inspect.getmodule(f)
+ relpath = _relpath(mod.__file__, os.getcwd()).replace('.pyc', '.py')
+ print
+ print 'Testing "%s" in %s:' % (fname, relpath)
+ sys.stdout.flush()
+ try:
+ _run_in_chdir(os.path.split(mod.__file__)[0], f)
+ except Exception, e: