##// END OF EJS Templates
add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.

File last commit:

r6681:6a6ef726 default
r6875:0d714a48 default
Show More
run-tests.py
620 lines | 18.9 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 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
Thomas Arendsen Hein
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
r5685 # reserved exit code to skip test (used by hghave)
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 SKIPPED_STATUS = 80
Thomas Arendsen Hein
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
r5685 SKIPPED_PREFIX = 'skipped: '
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
Stephen Darnell
Add a pure python version of run-tests....
r2110
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 defaults = {
'jobs': ('HGTEST_JOBS', 1),
'timeout': ('HGTEST_TIMEOUT', 180),
'port': ('HGTEST_PORT', 20059),
}
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 parser = optparse.OptionParser("%prog [options] [tests]")
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-C", "--annotate", action="store_true",
help="output files annotated with coverage")
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 parser.add_option("--child", type="int",
help="run as child process, summary to given fd")
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")
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-f", "--first", action="store_true",
help="exit on the first test failure")
parser.add_option("-i", "--interactive", action="store_true",
help="prompt to accept changed output")
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 parser.add_option("-j", "--jobs", type="int",
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 help="number of jobs to run in parallel"
" (default: $%s or %d)" % defaults['jobs'])
Peter Arrenbrecht
tests: add --keep-tmp to run-tests.py to debug test environment...
r6208 parser.add_option("--keep-tmpdir", action="store_true",
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 help="keep temporary directory after running tests"
" (best used with --tmpdir)")
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-R", "--restart", action="store_true",
help="restart at last error")
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 parser.add_option("-p", "--port", type="int",
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 help="port on which servers should listen"
" (default: $%s or %d)" % defaults['port'])
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-r", "--retest", action="store_true",
help="retest failed tests")
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 parser.add_option("-s", "--cover_stdlib", action="store_true",
help="print a test coverage report inc. standard libraries")
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-t", "--timeout", type="int",
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 help="kill errant tests after TIMEOUT seconds"
" (default: $%s or %d)" % defaults['timeout'])
Bryan O'Sullivan
run-tests.py: allow a different temporary directory to be specified
r5388 parser.add_option("--tmpdir", type="string",
help="run tests in the given temporary directory")
Bryan O'Sullivan
run-tests.py: reorder options alphabetically.
r5383 parser.add_option("-v", "--verbose", action="store_true",
help="output verbose messages")
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 parser.add_option("--with-hg", type="string",
help="test existing install at given location")
Matt Mackall
run-tests: add --retest switch...
r3300
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 for option, default in defaults.items():
Thomas Arendsen Hein
run-tests.py: Make tests run with python2.3 if HGTEST_* is set....
r6681 defaults[option] = int(os.environ.get(*default))
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 parser.set_defaults(**defaults)
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
Alexis S. L. Carvalho
run-tests.py: use coverage.py with *.py tests
r4319 python = sys.executable
Stephen Darnell
Add a pure python version of run-tests....
r2110
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 if options.jobs < 1:
print >> sys.stderr, 'ERROR: -j/--jobs must be positive'
sys.exit(1)
if options.interactive and options.jobs > 1:
print >> sys.stderr, 'ERROR: cannot mix -interactive and --jobs > 1'
sys.exit(1)
Patrick Mezard
Make run-tests.py --interactive work on Windows
r5800 def rename(src, dst):
"""Like os.rename(), trade atomicity and opened files friendliness
for existing destination support.
"""
shutil.copy(src, dst)
os.remove(src)
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
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 def extract_missing_features(lines):
'''Extract missing/unknown features log lines as a list'''
missing = []
for line in lines:
Thomas Arendsen Hein
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
r5685 if not line.startswith(SKIPPED_PREFIX):
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 continue
line = line.splitlines()[0]
Thomas Arendsen Hein
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
r5685 missing.append(line[len(SKIPPED_PREFIX):])
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881
return missing
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():
Peter Arrenbrecht
tests: add --keep-tmp to run-tests.py to debug test environment...
r6208 if not options.keep_tmpdir:
if verbose:
print "# Cleaning up HGTMP", HGTMP
shutil.rmtree(HGTMP, True)
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 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():
Alexis S. L. Carvalho
run-tests.py: use coverage.py with *.py tests
r4319 global python
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 vlog("# Performing temporary installation of HG")
installerrs = os.path.join("tests", "install.err")
Stephen Darnell
Add a pure python version of run-tests....
r2110
Brendan Cully
Make run-tests.py work when invoked outside of tests....
r5267 # Run installer in hg root
os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '..'))
Thomas Arendsen Hein
Always clean the build directory before installing for running the tests....
r2183 cmd = ('%s setup.py clean --all'
Alexis S. L. Carvalho
run-tests.py: pass --install-scripts to setup.py...
r5189 ' install --force --home="%s" --install-lib="%s"'
' --install-scripts="%s" >%s 2>&1'
% (sys.executable, INST, PYTHONDIR, BINDIR, 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"])
Patrick Mezard
run-tests: append PYTHONPATH instead of overwriting it...
r5251
Brendan Cully
Include . in PYTHONPATH (makes testing unbundled extensions easier)
r5268 pydir = os.pathsep.join([PYTHONDIR, TESTDIR])
Patrick Mezard
run-tests: append PYTHONPATH instead of overwriting it...
r5251 pythonpath = os.environ.get("PYTHONPATH")
if pythonpath:
Brendan Cully
Include . in PYTHONPATH (makes testing unbundled extensions easier)
r5268 pythonpath = pydir + os.pathsep + pythonpath
Patrick Mezard
run-tests: append PYTHONPATH instead of overwriting it...
r5251 else:
Brendan Cully
Include . in PYTHONPATH (makes testing unbundled extensions easier)
r5268 pythonpath = pydir
Patrick Mezard
run-tests: append PYTHONPATH instead of overwriting it...
r5251 os.environ["PYTHONPATH"] = pythonpath
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')
Thomas Arendsen Hein
Cleanup of whitespace, indentation and line continuation.
r4633 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')))
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 f.close()
os.chmod(os.path.join(BINDIR, 'hg'), 0700)
Alexis S. L. Carvalho
run-tests.py: use coverage.py with *.py tests
r4319 python = '"%s" "%s" -x' % (sys.executable,
os.path.join(TESTDIR,'coverage.py'))
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144
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)
Alexis S. L. Carvalho
run-tests.py: tell coverage.py to ignore errors...
r4318 cmd = '"%s" "%s" -i -r "--omit=%s"' % (
Vadim Gelfer
make indentation of coverage code in run-tests.py nicer.
r2145 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)
Alexis S. L. Carvalho
run-tests.py: tell coverage.py to ignore errors...
r4318 cmd = '"%s" "%s" -i -a "--directory=%s" "--omit=%s"' % (
Vadim Gelfer
make indentation of coverage code in run-tests.py nicer.
r2145 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()
Patrick Mezard
run-tests: extract correct status when script terminates with exit
r4880 if os.WIFEXITED(ret):
ret = os.WEXITSTATUS(ret)
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 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
Thomas Arendsen Hein
Add message to test output if a test is aborted due to a timeout....
r5078 output += ("\n### Abort: timeout after %d seconds.\n"
% options.timeout)
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
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 def run_one(test, skips, fails):
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 '''tristate output:
None -> skipped
True -> passed
False -> failed'''
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 def skip(msg):
if not verbose:
skips.append((test, msg))
else:
print "\nSkipping %s: %s" % (test, msg)
return None
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 def fail(msg):
fails.append((test, msg))
print "\nERROR: %s %s" % (test, msg)
return None
Stephen Darnell
Add a pure python version of run-tests....
r2110 vlog("# Test", test)
Thomas Arendsen Hein
Clear contents of global hgrc for tests before running each test....
r2989 # create a fresh hgrc
hgrc = file(HGRCPATH, 'w+')
Alexis S. L. Carvalho
run-tests.py: set ui.slash = True...
r4529 hgrc.write('[ui]\n')
hgrc.write('slash = True\n')
Alexis S. L. Carvalho
run-tests.py: add a default --date "0 0" argument to commit et al...
r5524 hgrc.write('[defaults]\n')
hgrc.write('backout = -d "0 0"\n')
hgrc.write('commit = -d "0 0"\n')
hgrc.write('debugrawcommit = -d "0 0"\n')
hgrc.write('tag = -d "0 0"\n')
Thomas Arendsen Hein
Clear contents of global hgrc for tests before running each test....
r2989 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")
Alexis S. L. Carvalho
run-tests.py: small cleanup
r4320 testpath = os.path.join(TESTDIR, test)
Stephen Darnell
Add a pure python version of run-tests....
r2110
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)
Alexis S. L. Carvalho
run-tests.py: use coverage.py with "#!/usr/bin/env python" tests
r4321 try:
tf = open(testpath)
firstline = tf.readline().rstrip()
tf.close()
except:
firstline = ''
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
Alexis S. L. Carvalho
run-tests.py: use coverage.py with "#!/usr/bin/env python" tests
r4321 if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
Alexis S. L. Carvalho
run-tests.py: small cleanup
r4320 cmd = '%s "%s"' % (python, testpath)
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 elif lctest.endswith('.bat'):
# do not run batch scripts on non-windows
if os.name != 'nt':
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 return skip("batch script")
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 # To reliably get the error code from batch files on WinXP,
# the "cmd /c call" prefix is needed. Grrr
Alexis S. L. Carvalho
run-tests.py: small cleanup
r4320 cmd = 'cmd /c call "%s"' % testpath
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 else:
# do not run shell scripts on windows
if os.name == 'nt':
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 return skip("shell script")
Vadim Gelfer
run-tests.py: skip tests that should not run....
r2710 # do not try to run non-executable programs
Alexis S. L. Carvalho
run-tests.py: small cleanup
r4320 if not os.access(testpath, os.X_OK):
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 return skip("not executable")
Alexis S. L. Carvalho
run-tests.py: small cleanup
r4320 cmd = '"%s"' % testpath
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)
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 skipped = (ret == SKIPPED_STATUS)
Vadim Gelfer
run-tests.py must print changed test output no matter what exit code is.
r2213 # 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 = []
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 if skipped:
missing = extract_missing_features(out)
if not missing:
missing = ['irrelevant']
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 skip(missing[-1])
Thomas Arendsen Hein
run-tests.py: Only one fail message when output changed and error code....
r6383 elif out != ref_out:
if ret:
fail("output changed and returned error code %d" % ret)
else:
fail("output changed")
show_diff(ref_out, out)
ret = 1
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 elif ret:
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 fail("returned error code %d" % ret)
Stephen Darnell
Add a pure python version of run-tests....
r2110
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 if not verbose:
Alexis S. L. Carvalho
run-tests.py: don't print a dot for skipped tests
r5518 sys.stdout.write(skipped and 's' or '.')
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 sys.stdout.flush()
Thomas Arendsen Hein
Remove trailing spaces
r5081 if ret != 0 and not skipped:
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 # 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)
Peter Arrenbrecht
tests: add --keep-tmp to run-tests.py to debug test environment...
r6208 if not options.keep_tmpdir:
Thomas Arendsen Hein
Replaced tab in run-tests.py
r6209 shutil.rmtree(tmpd, True)
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 if skipped:
return None
Stephen Darnell
Add a pure python version of run-tests....
r2110 return ret == 0
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 if not options.child:
os.umask(022)
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 check_required_tools()
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
# 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'
Thomas Arendsen Hein
Don't let ui.username override web.contact (issue900)...
r5779 os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133
TESTDIR = os.environ["TESTDIR"] = os.getcwd()
Bryan O'Sullivan
run-tests.py: allow a different temporary directory to be specified
r5388 HGTMP = os.environ['HGTMP'] = tempfile.mkdtemp('', 'hgtests.', options.tmpdir)
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 DAEMON_PIDS = None
HGRCPATH = None
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
Matt Mackall
merge: allow smarter tool configuration...
r6004 os.environ["HGMERGE"] = "internal:merge"
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 os.environ["HGUSER"] = "test"
os.environ["HGENCODING"] = "ascii"
os.environ["HGENCODINGMODE"] = "strict"
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 os.environ["HGPORT"] = str(options.port)
os.environ["HGPORT1"] = str(options.port + 1)
os.environ["HGPORT2"] = str(options.port + 2)
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 if options.with_hg:
INST = options.with_hg
else:
INST = os.path.join(HGTMP, "install")
Stephen Darnell
Add code coverage to the python version of run-tests (inc. annotation)...
r2144 BINDIR = os.path.join(INST, "bin")
PYTHONDIR = os.path.join(INST, "lib", "python")
COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 def run_children(tests):
if not options.with_hg:
install_hg()
optcopy = dict(options.__dict__)
optcopy['jobs'] = 1
optcopy['with_hg'] = INST
opts = []
for opt, value in optcopy.iteritems():
name = '--' + opt.replace('_', '-')
if value is True:
opts.append(name)
elif value is not None:
opts.append(name + '=' + str(value))
tests.reverse()
jobs = [[] for j in xrange(options.jobs)]
while tests:
for j in xrange(options.jobs):
if not tests: break
jobs[j].append(tests.pop())
fps = {}
for j in xrange(len(jobs)):
job = jobs[j]
if not job:
continue
rfd, wfd = os.pipe()
childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
cmdline = [python, sys.argv[0]] + opts + childopts + job
vlog(' '.join(cmdline))
fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
os.close(wfd)
failures = 0
tested, skipped, failed = 0, 0, 0
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 skips = []
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 fails = []
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 while fps:
pid, status = os.wait()
fp = fps.pop(pid)
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 l = fp.read().splitlines()
test, skip, fail = map(int, l[:3])
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 split = -fail or len(l)
for s in l[3:split]:
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 skips.append(s.split(" ", 1))
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 for s in l[split:]:
fails.append(s.split(" ", 1))
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 tested += test
skipped += skip
failed += fail
vlog('pid %d exited, status %d' % (pid, status))
failures |= status
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 print
for s in skips:
print "Skipped %s: %s" % (s[0], s[1])
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 for s in fails:
print "Failed %s: %s" % (s[0], s[1])
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 print "# Ran %d tests, %d skipped, %d failed." % (
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 tested, skipped, failed)
sys.exit(failures != 0)
def run_tests(tests):
global DAEMON_PIDS, HGRCPATH
DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 try:
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 if not options.with_hg:
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
Matt Mackall
tests: add -R switch...
r3625 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: tidy up reporting of skipped tests...
r5470 skips = []
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 fails = []
Matt Mackall
tests: add -R switch...
r3625 for test in tests:
if options.retest and not os.path.exists(test + ".err"):
skipped += 1
continue
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 ret = run_one(test, skips, fails)
Matt Mackall
tests: add -R switch...
r3625 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():
Patrick Mezard
Make run-tests.py --interactive work on Windows
r5800 rename(test + ".err", test + ".out")
Matt Mackall
tests: add -i switch...
r3626 tested += 1
Matt Mackall
tests: teach -i about fails list
r6343 fails.pop()
Matt Mackall
tests: add -i switch...
r3626 continue
Matt Mackall
tests: add -R switch...
r3625 failed += 1
if options.first:
break
tested += 1
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 if options.child:
fp = os.fdopen(options.child, 'w')
fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 for s in skips:
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760 fp.write("%s %s\n" % s)
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 for s in fails:
fp.write("%s %s\n" % s)
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 fp.close()
else:
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 print
for s in skips:
print "Skipped %s: %s" % s
Benoit Boissinot
run-tests.py: add a summary of failed tests at the end
r6244 for s in fails:
print "Failed %s: %s" % s
Matt Mackall
tests: tidy up reporting of skipped tests...
r5470 print "# Ran %d tests, %d skipped, %d failed." % (
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 tested, skipped, failed)
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 if coverage:
output_coverage()
except KeyboardInterrupt:
failed = True
print "\ninterrupted!"
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
if failed:
sys.exit(1)
if len(args) == 0:
args = os.listdir(".")
args.sort()
tests = []
for test in args:
if (test.startswith("test-") and '~' not in test and
('.' not in test or test.endswith('.py') or
test.endswith('.bat'))):
tests.append(test)
vlog("# Using TESTDIR", TESTDIR)
vlog("# Using HGTMP", HGTMP)
try:
if len(tests) > 1 and options.jobs > 1:
run_children(tests)
else:
run_tests(tests)
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 finally:
cleanup_exit()