##// END OF EJS Templates
Add missing test output
Add missing test output

File last commit:

r3626:02e9355c default
r3735:205f0fd4 default
Show More
run-tests.py
419 lines | 12.8 KiB | text/x-python | PythonLexer
Stephen Darnell
Add a pure python version of run-tests....
r2110 #!/usr/bin/env python
#
# run-tests.py - Run a set of tests on Mercurial
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 import difflib
import errno
import optparse
import os
import popen2
import re
import shutil
import signal
import sys
Stephen Darnell
Add a pure python version of run-tests....
r2110 import tempfile
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 import time
Stephen Darnell
Add a pure python version of run-tests....
r2110
Lee Cantey
Add merge to list of required tools.
r2611 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"]
Stephen Darnell
Add a pure python version of run-tests....
r2110
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 parser = optparse.OptionParser("%prog [options] [tests]")
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 parser.add_option("-v", "--verbose", action="store_true",
help="output verbose messages")
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 parser.add_option("-t", "--timeout", type="int",
Will Maier
Provide a relevant description for --timeout.
r2672 help="kill errant tests after TIMEOUT seconds")
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 parser.add_option("-c", "--cover", action="store_true",
help="print a test coverage report")
parser.add_option("-s", "--cover_stdlib", action="store_true",
help="print a test coverage report inc. standard libraries")
parser.add_option("-C", "--annotate", action="store_true",
help="output files annotated with coverage")
Matt Mackall
run-tests: add --retest switch...
r3300 parser.add_option("-r", "--retest", action="store_true",
help="retest failed tests")
Matt Mackall
run-tests: add --first switch to exit on first error
r3301 parser.add_option("-f", "--first", action="store_true",
help="exit on the first test failure")
Matt Mackall
tests: add -R switch...
r3625 parser.add_option("-R", "--restart", action="store_true",
help="restart at last error")
Matt Mackall
tests: add -i switch...
r3626 parser.add_option("-i", "--interactive", action="store_true",
help="prompt to accept changed output")
Matt Mackall
run-tests: add --retest switch...
r3300
Thomas Arendsen Hein
Changed default timeout for run-tests.py from 30 to 180 seconds....
r2576 parser.set_defaults(timeout=180)
Stephen Darnell
Add a pure python version of run-tests....
r2110 (options, args) = parser.parse_args()
verbose = options.verbose
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 coverage = options.cover or options.cover_stdlib or options.annotate
Stephen Darnell
Add a pure python version of run-tests....
r2110
def vlog(*msg):
if verbose:
for m in msg:
print m,
print
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 def splitnewlines(text):
'''like str.splitlines, but only split on newlines.
keep line endings.'''
i = 0
lines = []
while True:
n = text.find('\n', i)
if n == -1:
last = text[i:]
if last:
lines.append(last)
return lines
lines.append(text[i:n+1])
i = n + 1
Stephen Darnell
Add a pure python version of run-tests....
r2110 def show_diff(expected, output):
for line in difflib.unified_diff(expected, output,
Thomas Arendsen Hein
Fix diff header (line endings) for failed test output in run-tests.py.
r2409 "Expected output", "Test output"):
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 sys.stdout.write(line)
Stephen Darnell
Add a pure python version of run-tests....
r2110
def find_program(program):
"""Search PATH for a executable program"""
for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
name = os.path.join(p, program)
if os.access(name, os.X_OK):
return name
return None
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 def check_required_tools():
# Before we go any further, check for pre-requisite tools
# stuff from coreutils (cat, rm, etc) are not tested
for p in required_tools:
if os.name == 'nt':
p += '.exe'
found = find_program(p)
if found:
vlog("# Found prerequisite", p, "at", found)
else:
print "WARNING: Did not find prerequisite tool: "+p
Stephen Darnell
Add a pure python version of run-tests....
r2110
def cleanup_exit():
if verbose:
print "# Cleaning up HGTMP", HGTMP
shutil.rmtree(HGTMP, True)
Vadim Gelfer
run-tests.py: make tests use same python interpreter as test harness....
r2570 def use_correct_python():
# some tests run python interpreter. they must use same
# interpreter we use or bad things will happen.
exedir, exename = os.path.split(sys.executable)
if exename == 'python':
path = find_program('python')
if os.path.dirname(path) == exedir:
return
vlog('# Making python executable in test path use correct Python')
my_python = os.path.join(BINDIR, 'python')
try:
os.symlink(sys.executable, my_python)
except AttributeError:
# windows fallback
shutil.copyfile(sys.executable, my_python)
shutil.copymode(sys.executable, my_python)
Thomas Arendsen Hein
Whitespace/Tab cleanup
r3223
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 def install_hg():
vlog("# Performing temporary installation of HG")
installerrs = os.path.join("tests", "install.err")
Stephen Darnell
Add a pure python version of run-tests....
r2110
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 os.chdir("..") # Get back to hg root
Thomas Arendsen Hein
Always clean the build directory before installing for running the tests....
r2183 cmd = ('%s setup.py clean --all'
' install --force --home="%s" --install-lib="%s" >%s 2>&1'
% (sys.executable, INST, PYTHONDIR, installerrs))
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 vlog("# Running", cmd)
if os.system(cmd) == 0:
if not verbose:
os.remove(installerrs)
else:
f = open(installerrs)
for line in f:
print line,
f.close()
sys.exit(1)
os.chdir(TESTDIR)
Stephen Darnell
Add a pure python version of run-tests....
r2110
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
os.environ["PYTHONPATH"] = PYTHONDIR
Stephen Darnell
Add a pure python version of run-tests....
r2110
Vadim Gelfer
run-tests.py: make tests use same python interpreter as test harness....
r2570 use_correct_python()
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 if coverage:
vlog("# Installing coverage wrapper")
os.environ['COVERAGE_FILE'] = COVERAGE_FILE
if os.path.exists(COVERAGE_FILE):
os.unlink(COVERAGE_FILE)
# Create a wrapper script to invoke hg via coverage.py
Vadim Gelfer
run-tests.py: remove trailing white space
r2146 os.rename(os.path.join(BINDIR, "hg"), os.path.join(BINDIR, "_hg.py"))
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 f = open(os.path.join(BINDIR, 'hg'), 'w')
f.write('#!' + sys.executable + '\n')
f.write('import sys, os; os.execv(sys.executable, [sys.executable, '+ \
'"%s", "-x", "%s"] + sys.argv[1:])\n' % (
os.path.join(TESTDIR, 'coverage.py'),
os.path.join(BINDIR, '_hg.py')))
f.close()
os.chmod(os.path.join(BINDIR, 'hg'), 0700)
def output_coverage():
Vadim Gelfer
make indentation of coverage code in run-tests.py nicer.
r2145 vlog("# Producing coverage report")
omit = [BINDIR, TESTDIR, PYTHONDIR]
if not options.cover_stdlib:
# Exclude as system paths (ignoring empty strings seen on win)
Vadim Gelfer
run-tests.py: remove trailing white space
r2146 omit += [x for x in sys.path if x != '']
Vadim Gelfer
make indentation of coverage code in run-tests.py nicer.
r2145 omit = ','.join(omit)
os.chdir(PYTHONDIR)
cmd = '"%s" "%s" -r "--omit=%s"' % (
sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
vlog("# Running: "+cmd)
os.system(cmd)
if options.annotate:
adir = os.path.join(TESTDIR, 'annotated')
if not os.path.isdir(adir):
os.mkdir(adir)
cmd = '"%s" "%s" -a "--directory=%s" "--omit=%s"' % (
sys.executable, os.path.join(TESTDIR, 'coverage.py'),
adir, omit)
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 vlog("# Running: "+cmd)
os.system(cmd)
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 class Timeout(Exception):
pass
def alarmed(signum, frame):
raise Timeout
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 def run(cmd):
Stephen Darnell
Add a pure python version of run-tests....
r2110 """Run command in a sub-process, capturing the output (stdout and stderr).
Return the exist code, and output."""
# TODO: Use subprocess.Popen if we're running on Python 2.4
if os.name == 'nt':
tochild, fromchild = os.popen4(cmd)
tochild.close()
output = fromchild.read()
ret = fromchild.close()
if ret == None:
ret = 0
else:
proc = popen2.Popen4(cmd)
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 try:
output = ''
proc.tochild.close()
output = proc.fromchild.read()
ret = proc.wait()
except Timeout:
vlog('# Process %d timed out - killing it' % proc.pid)
os.kill(proc.pid, signal.SIGTERM)
ret = proc.wait()
if ret == 0:
ret = signal.SIGTERM << 8
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 return ret, splitnewlines(output)
Stephen Darnell
Add a pure python version of run-tests....
r2110
def run_one(test):
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 '''tristate output:
None -> skipped
True -> passed
False -> failed'''
Stephen Darnell
Add a pure python version of run-tests....
r2110 vlog("# Test", test)
if not verbose:
sys.stdout.write('.')
sys.stdout.flush()
Thomas Arendsen Hein
Clear contents of global hgrc for tests before running each test....
r2989 # create a fresh hgrc
hgrc = file(HGRCPATH, 'w+')
hgrc.close()
Stephen Darnell
Add a pure python version of run-tests....
r2110 err = os.path.join(TESTDIR, test+".err")
ref = os.path.join(TESTDIR, test+".out")
if os.path.exists(err):
os.remove(err) # Remove any previous output files
# Make a tmp subdirectory to work in
tmpd = os.path.join(HGTMP, test)
os.mkdir(tmpd)
os.chdir(tmpd)
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 lctest = test.lower()
Stephen Darnell
Add a pure python version of run-tests....
r2110
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 if lctest.endswith('.py'):
cmd = '%s "%s"' % (sys.executable, os.path.join(TESTDIR, test))
elif lctest.endswith('.bat'):
# do not run batch scripts on non-windows
if os.name != 'nt':
print '\nSkipping %s: batch script' % test
return None
# To reliably get the error code from batch files on WinXP,
# the "cmd /c call" prefix is needed. Grrr
Stephen Darnell
Add a pure python version of run-tests....
r2110 cmd = 'cmd /c call "%s"' % (os.path.join(TESTDIR, test))
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 else:
# do not run shell scripts on windows
if os.name == 'nt':
print '\nSkipping %s: shell script' % test
return None
# do not try to run non-executable programs
if not os.access(os.path.join(TESTDIR, test), os.X_OK):
print '\nSkipping %s: not executable' % test
return None
cmd = '"%s"' % (os.path.join(TESTDIR, test))
Stephen Darnell
Add a pure python version of run-tests....
r2110
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 if options.timeout > 0:
signal.alarm(options.timeout)
Stephen Darnell
Add a pure python version of run-tests....
r2110 vlog("# Running", cmd)
ret, out = run(cmd)
vlog("# Ret was:", ret)
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 if options.timeout > 0:
signal.alarm(0)
Vadim Gelfer
run-tests.py must print changed test output no matter what exit code is.
r2213 diffret = 0
# If reference output file exists, check test output against it
if os.path.exists(ref):
f = open(ref, "r")
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 ref_out = splitnewlines(f.read())
Vadim Gelfer
run-tests.py must print changed test output no matter what exit code is.
r2213 f.close()
Vadim Gelfer
run-tests.py: print diff if reference output not existing.
r2246 else:
Alexis S. L. Carvalho
run-tests.py: fix diff output when test-foo.out doesn't exist....
r2703 ref_out = []
Vadim Gelfer
run-tests.py: print diff if reference output not existing.
r2246 if out != ref_out:
diffret = 1
print "\nERROR: %s output changed" % (test)
show_diff(ref_out, out)
Vadim Gelfer
run-tests.py must print changed test output no matter what exit code is.
r2213 if ret:
Stephen Darnell
Add a pure python version of run-tests....
r2110 print "\nERROR: %s failed with error code %d" % (test, ret)
Vadim Gelfer
run-tests.py must print changed test output no matter what exit code is.
r2213 elif diffret:
ret = diffret
Stephen Darnell
Add a pure python version of run-tests....
r2110
if ret != 0: # Save errors to a file for diagnosis
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 f = open(err, "wb")
Stephen Darnell
Add a pure python version of run-tests....
r2110 for line in out:
f.write(line)
f.close()
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 # Kill off any leftover daemon processes
try:
fp = file(DAEMON_PIDS)
for line in fp:
try:
pid = int(line)
except ValueError:
continue
try:
os.kill(pid, 0)
vlog('# Killing daemon process %d' % pid)
os.kill(pid, signal.SIGTERM)
time.sleep(0.25)
os.kill(pid, 0)
vlog('# Daemon process %d is stuck - really killing it' % pid)
os.kill(pid, signal.SIGKILL)
except OSError, err:
if err.errno != errno.ESRCH:
raise
fp.close()
os.unlink(DAEMON_PIDS)
except IOError:
pass
Stephen Darnell
Add a pure python version of run-tests....
r2110 os.chdir(TESTDIR)
shutil.rmtree(tmpd, True)
return ret == 0
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
os.umask(022)
check_required_tools()
# Reset some environment variables to well-known values so that
# the tests produce repeatable output.
os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
os.environ['TZ'] = 'GMT'
os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"'
os.environ["HGUSER"] = "test"
TESTDIR = os.environ["TESTDIR"] = os.getcwd()
HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
Thomas Arendsen Hein
Clear contents of global hgrc for tests before running each test....
r2989 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 vlog("# Using TESTDIR", TESTDIR)
vlog("# Using HGTMP", HGTMP)
Stephen Darnell
Add a pure python version of run-tests....
r2110
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 INST = os.path.join(HGTMP, "install")
BINDIR = os.path.join(INST, "bin")
PYTHONDIR = os.path.join(INST, "lib", "python")
COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 try:
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 try:
install_hg()
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 if options.timeout > 0:
try:
signal.signal(signal.SIGALRM, alarmed)
vlog('# Running tests with %d-second timeout' %
options.timeout)
except AttributeError:
print 'WARNING: cannot run tests with timeouts'
options.timeout = 0
Matt Mackall
tests: add -R switch...
r3625 tested = 0
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 failed = 0
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 skipped = 0
Stephen Darnell
Add a pure python version of run-tests....
r2110
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 if len(args) == 0:
args = os.listdir(".")
Matt Mackall
tests: sort test list if running all tests
r3624 args.sort()
Matt Mackall
tests: add -R switch...
r3625
tests = []
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 for test in args:
Alexis S. L. Carvalho
Allow tests that end in .py and .bat...
r2702 if (test.startswith("test-") and '~' not in test and
Thomas Arendsen Hein
Whitespace/Tab cleanup
r3223 ('.' not in test or test.endswith('.py') or
Alexis S. L. Carvalho
Allow tests that end in .py and .bat...
r2702 test.endswith('.bat'))):
Matt Mackall
tests: add -R switch...
r3625 tests.append(test)
if options.restart:
orig = list(tests)
while tests:
if os.path.exists(tests[0] + ".err"):
break
tests.pop(0)
if not tests:
print "running all tests"
tests = orig
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
Matt Mackall
tests: add -R switch...
r3625 for test in tests:
if options.retest and not os.path.exists(test + ".err"):
skipped += 1
continue
ret = run_one(test)
if ret is None:
skipped += 1
elif not ret:
Matt Mackall
tests: add -i switch...
r3626 if options.interactive:
print "Accept this change? [n] ",
answer = sys.stdin.readline().strip()
if answer.lower() in "y yes".split():
os.rename(test + ".err", test + ".out")
tested += 1
continue
Matt Mackall
tests: add -R switch...
r3625 failed += 1
if options.first:
break
tested += 1
print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped,
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 failed)
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 if coverage:
output_coverage()
except KeyboardInterrupt:
failed = True
print "\ninterrupted!"
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 finally:
cleanup_exit()
Stephen Darnell
Add a pure python version of run-tests....
r2110
if failed:
sys.exit(1)