##// END OF EJS Templates
run-tests: move results global into TestRunner
run-tests: move results global into TestRunner

File last commit:

r21359:7982475d default
r21359:7982475d default
Show More
run-tests.py
1442 lines | 50.3 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>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Stephen Darnell
Add a pure python version of run-tests....
r2110
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 # Modifying this script is tricky because it has many modes:
# - serial (default) vs parallel (-jN, N > 1)
# - no coverage (default) vs coverage (-c, -C, -s)
# - temp install (default) vs specific hg script (--with-hg, --local)
# - tests are a mix of shell scripts and Python scripts
#
# If you change this script, it is recommended that you ensure you
# haven't broken it by running it in various modes with a representative
# sample of test scripts. For example:
Dirkjan Ochtman
kill trailing whitespace
r8843 #
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 # 1) serial, no coverage, temp install:
# ./run-tests.py test-s*
# 2) serial, no coverage, local hg:
# ./run-tests.py --local test-s*
# 3) serial, coverage, temp install:
# ./run-tests.py -c test-s*
# 4) serial, coverage, local hg:
# ./run-tests.py -c --local test-s* # unsupported
# 5) parallel, no coverage, temp install:
# ./run-tests.py -j2 test-s*
# 6) parallel, no coverage, local hg:
# ./run-tests.py -j2 --local test-s*
# 7) parallel, coverage, temp install:
# ./run-tests.py -j2 -c test-s* # currently broken
Greg Ward
run-tests: give each child its own tmp dir (issue1911)...
r9899 # 8) parallel, coverage, local install:
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 # ./run-tests.py -j2 -c --local test-s* # unsupported (and broken)
Greg Ward
run-tests: give each child its own tmp dir (issue1911)...
r9899 # 9) parallel, custom tmp dir:
# ./run-tests.py -j2 --tmpdir /tmp/myhgtests
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 #
# (You could use any subset of the tests: test-s* happens to match
# enough that it's worth doing parallel runs, few enough that it
# completes fairly quickly, includes both shell and Python scripts, and
# includes some scripts that run daemon processes.)
Dirkjan Ochtman
tests: use external coverage, mandate newer version...
r10648 from distutils import version
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 import difflib
import errno
import optparse
import os
Nicolas Dumazet
pylint, pyflakes: remove unused or duplicate imports
r10905 import shutil
Martin Geisler
util: always use subprocess
r8280 import subprocess
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 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
Pierre-Yves David
test: display used python hash seed...
r18616 import random
Matt Mackall
tests: basic support for unified tests
r11741 import re
Matt Mackall
run-tests: add locking on results struct
r14000 import threading
Patrick Mezard
run-tests: do not duplicate killdaemons() code
r17464 import killdaemons as killmod
Bryan O'Sullivan
run-tests: support running tests in parallel on windows...
r18057 import Queue as queue
Stephen Darnell
Add a pure python version of run-tests....
r2110
Matt Mackall
run-tests: do chdir for tests under a lock for thread safety
r14019 processlock = threading.Lock()
Brendan Cully
run-tests: lock popen wait/poll...
r19413
Brendan Cully
run-tests: replace popen locking with a noop _cleanup handler on py24...
r19415 # subprocess._cleanup can race with any Popen.wait or Popen.poll on py24
# http://bugs.python.org/issue1731717 for details. We shouldn't be producing
# zombies but it's pretty harmless even if we do.
Simon Heimberg
run-tests: better check for python version...
r20219 if sys.version_info < (2, 5):
Brendan Cully
run-tests: replace popen locking with a noop _cleanup handler on py24...
r19415 subprocess._cleanup = lambda: None
Matt Mackall
run-tests: do chdir for tests under a lock for thread safety
r14019
Martin Geisler
util: always use subprocess
r8280 closefds = os.name == 'posix'
Matt Mackall
run-tests: add env dict to isolate test environment
r19262 def Popen4(cmd, wd, timeout, env=None):
Matt Mackall
run-tests: do chdir for tests under a lock for thread safety
r14019 processlock.acquire()
Matt Mackall
run-tests: add env dict to isolate test environment
r19262 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
Martin Geisler
util: always use subprocess
r8280 close_fds=closefds,
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
Matt Mackall
run-tests: do chdir for tests under a lock for thread safety
r14019 processlock.release()
Martin Geisler
util: always use subprocess
r8280 p.fromchild = p.stdout
p.tochild = p.stdin
p.childerr = p.stderr
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001
Patrick Mezard
run-tests: ignore timeout when Popen.terminate is unavailable...
r14337 p.timeout = False
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001 if timeout:
def t():
start = time.time()
while time.time() - start < timeout and p.returncode is None:
Matt Mackall
tests: shorten post-test sleeps...
r16346 time.sleep(.1)
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001 p.timeout = True
if p.returncode is None:
Thomas Arendsen Hein
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
r14821 terminate(p)
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001 threading.Thread(target=t).start()
Martin Geisler
util: always use subprocess
r8280 return p
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: '
Nicolas Dumazet
run-tests: detect when hghave fails to check for a feature and fail test...
r8060 FAILED_PREFIX = 'hghave check failed: '
Mads Kiilerich
run-tests: convert windows paths to unix
r15448 PYTHON = sys.executable.replace('\\', '/')
Ronny Pfannschmidt
tests: adapt the test runner to work with jython
r10758 IMPL_PATH = 'PYTHONPATH'
if 'java' in sys.platform:
IMPL_PATH = 'JYTHONPATH'
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881
Yuya Nishihara
run-tests: initialize global variables to suppress pyflakes warning
r21231 TESTDIR = HGTMP = INST = BINDIR = TMPBINDIR = PYTHONDIR = None
Bryan O'Sullivan
run-tests: check for the correct python when starting
r18049 requiredtools = [os.path.basename(sys.executable), "diff", "grep", "unzip",
"gunzip", "bunzip2", "sed"]
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),
Mads Kiilerich
tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh'...
r15941 'shell': ('HGTEST_SHELL', 'sh'),
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
r6366 }
Augie Fackler
run-tests: allow whitelisting tests that should always run...
r14493 def parselistfiles(files, listtype, warn=True):
entries = dict()
for filename in files:
try:
path = os.path.expanduser(os.path.expandvars(filename))
f = open(path, "r")
except IOError, err:
if err.errno != errno.ENOENT:
raise
if warn:
print "warning: no such %s file: %s" % (listtype, filename)
continue
for line in f.readlines():
line = line.split('#', 1)[0].strip()
if line:
entries[line] = filename
f.close()
return entries
Gregory Szorc
run-tests: allow option parser to be extended...
r21008 def getparser():
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser = optparse.OptionParser("%prog [options] [tests]")
Matt Mackall
run-tests: sort options
r11039
# keep these sorted
parser.add_option("--blacklist", action="append",
help="skip tests listed in the specified blacklist file")
Augie Fackler
run-tests: allow whitelisting tests that should always run...
r14493 parser.add_option("--whitelist", action="append",
help="always run tests listed in the specified whitelist file")
Mads Kiilerich
tests: add run-tests --changed option for running tests changed in revisions...
r20821 parser.add_option("--changed", type="string",
help="run tests that are changed in parent rev or working directory")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-C", "--annotate", action="store_true",
help="output files annotated with coverage")
parser.add_option("-c", "--cover", action="store_true",
help="print a test coverage report")
Matt Mackall
run-tests: sort options
r11039 parser.add_option("-d", "--debug", action="store_true",
help="debug mode: write output of test scripts to console"
Mads Kiilerich
spelling: fixes from spell checker
r21024 " rather than capturing and diffing it (disables timeout)")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-f", "--first", action="store_true",
help="exit on the first test failure")
Markus Zapke-Gründemann
tests: add htmlcov option
r15859 parser.add_option("-H", "--htmlcov", action="store_true",
help="create an HTML report of the coverage of the files")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-i", "--interactive", action="store_true",
help="prompt to accept changed output")
parser.add_option("-j", "--jobs", type="int",
help="number of jobs to run in parallel"
" (default: $%s or %d)" % defaults['jobs'])
parser.add_option("--keep-tmpdir", action="store_true",
Greg Ward
run-tests: make --tmpdir option more useful....
r9706 help="keep temporary directory after running tests")
Matt Mackall
run-tests: sort options
r11039 parser.add_option("-k", "--keywords",
help="run tests matching keywords")
parser.add_option("-l", "--local", action="store_true",
help="shortcut for --with-hg=<testdir>/../hg")
Matt Mackall
run-tests: add --loop support...
r19283 parser.add_option("--loop", action="store_true",
help="loop tests repeatedly")
Matt Mackall
run-tests: sort options
r11039 parser.add_option("-n", "--nodiff", action="store_true",
help="skip showing test changes")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-p", "--port", type="int",
help="port on which servers should listen"
" (default: $%s or %d)" % defaults['port'])
Bryan O'Sullivan
run-tests: add a --compiler option...
r17966 parser.add_option("--compiler", type="string",
help="compiler to build with")
Matt Mackall
run-tests: sort options
r11039 parser.add_option("--pure", action="store_true",
help="use pure Python code instead of C extensions")
parser.add_option("-R", "--restart", action="store_true",
help="restart at last error")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-r", "--retest", action="store_true",
help="retest failed tests")
Matt Mackall
run-tests: add --noskips option
r9580 parser.add_option("-S", "--noskips", action="store_true",
help="don't report skip tests verbosely")
Martin Geisler
run-tests: add --shell command line flag...
r14202 parser.add_option("--shell", type="string",
help="shell to use (default: $%s or %s)" % defaults['shell'])
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-t", "--timeout", type="int",
help="kill errant tests after TIMEOUT seconds"
" (default: $%s or %d)" % defaults['timeout'])
Siddharth Agarwal
run-tests: add --time option to log times for each test...
r17921 parser.add_option("--time", action="store_true",
help="time how long each test takes")
Matt Mackall
run-tests: sort options
r11039 parser.add_option("--tmpdir", type="string",
help="run tests in the given temporary directory"
" (implies --keep-tmpdir)")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("-v", "--verbose", action="store_true",
help="output verbose messages")
Matt Mackall
run-tests: add --view switch to use external diff viewer
r11040 parser.add_option("--view", type="string",
help="external diff viewer")
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.add_option("--with-hg", type="string",
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 metavar="HG",
help="test using specified hg script rather than a "
"temporary installation")
Alejandro Santos
tests: add -3 switch to run-tests.py
r9028 parser.add_option("-3", "--py3k-warnings", action="store_true",
help="enable Py3k warnings on Python 2.6+")
Augie Fackler
run-tests: add flag to provide extra hgrc options for test runs
r14134 parser.add_option('--extra-config-opt', action="append",
help='set the given config opt in the test hgrc')
Mads Kiilerich
run-tests: introduce --random for running tests in random error...
r19057 parser.add_option('--random', action="store_true",
help='run tests in random order')
Stephen Darnell
Add a pure python version of run-tests....
r2110
Martin Geisler
run-tests: use type of default to convert environment variable...
r14201 for option, (envvar, default) in defaults.items():
defaults[option] = type(default)(os.environ.get(envvar, default))
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 parser.set_defaults(**defaults)
Gregory Szorc
run-tests: allow option parser to be extended...
r21008
return parser
def parseargs(args, parser):
Gregory Szorc
run-tests: Pass arguments into argument parser...
r21006 (options, args) = parser.parse_args(args)
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091
Ronny Pfannschmidt
tests: adapt the test runner to work with jython
r10758 # jython is always pure
Ronny Pfannschmidt
run-tests: force to test pure on pypy as well
r10766 if 'java' in sys.platform or '__pypy__' in sys.modules:
Ronny Pfannschmidt
Fix run-tests.py -jX after 2ed667a9dfcb
r10765 options.pure = True
Ronny Pfannschmidt
tests: adapt the test runner to work with jython
r10758
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 if options.with_hg:
Mads Kiilerich
run-tests: expand user in --with-hg...
r15942 options.with_hg = os.path.expanduser(options.with_hg)
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 if not (os.path.isfile(options.with_hg) and
os.access(options.with_hg, os.X_OK)):
parser.error('--with-hg must specify an executable hg script')
if not os.path.basename(options.with_hg) == 'hg':
Thomas Arendsen Hein
run-tests: print a newline after all warnings
r14359 sys.stderr.write('warning: --with-hg should specify an hg script\n')
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 if options.local:
testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
hgbin = os.path.join(os.path.dirname(testdir), 'hg')
Mads Kiilerich
tests: don't require 'hg' without extension on windows...
r16538 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 parser.error('--local specified, but %r not found or not executable'
% hgbin)
options.with_hg = hgbin
Markus Zapke-Gründemann
tests: add htmlcov option
r15859 options.anycoverage = options.cover or options.annotate or options.htmlcov
Dirkjan Ochtman
tests: use external coverage, mandate newer version...
r10648 if options.anycoverage:
try:
import coverage
covver = version.StrictVersion(coverage.__version__).version
if covver < (3, 3):
parser.error('coverage options require coverage 3.3 or later')
except ImportError:
parser.error('coverage options now require the coverage package')
Greg Ward
run-tests: reduce global variables set by parse_args().
r8095
Dirkjan Ochtman
tests: use external coverage, mandate newer version...
r10648 if options.anycoverage and options.local:
# this needs some path mangling somewhere, I guess
parser.error("sorry, coverage options do not work when --local "
"is specified")
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674
Matt Mackall
run-tests: make vlog a proper function
r19250 global verbose
Greg Ward
run-tests: reduce global variables set by parse_args().
r8095 if options.verbose:
Matt Mackall
run-tests: drop options.child and users
r19279 verbose = ''
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091
Nicolas Dumazet
run-tests: expand --tmpdir and create it if needed
r9394 if options.tmpdir:
options.tmpdir = os.path.expanduser(options.tmpdir)
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091 if options.jobs < 1:
Martin Geisler
run-tests: standardize on --foo instead of -f/--foo...
r9408 parser.error('--jobs must be positive')
Greg Ward
run-tests: add "debug" mode: don't capture child output, just show it....
r9707 if options.interactive and options.debug:
parser.error("-i/--interactive and -d/--debug are incompatible")
if options.debug:
if options.timeout != defaults['timeout']:
sys.stderr.write(
'warning: --timeout option ignored with --debug\n')
options.timeout = 0
Alejandro Santos
tests: add -3 switch to run-tests.py
r9028 if options.py3k_warnings:
if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
Martin Geisler
run-tests: standardize on --foo instead of -f/--foo...
r9408 parser.error('--py3k-warnings can only be used on Python 2.6+')
Nicolas Dumazet
run-tests: add a "--blacklist target" option to skip predefined test lists...
r9959 if options.blacklist:
Augie Fackler
run-tests: allow whitelisting tests that should always run...
r14493 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
if options.whitelist:
Matt Mackall
run-tests: drop options.child and users
r19279 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
Augie Fackler
run-tests: allow whitelisting tests that should always run...
r14493 else:
options.whitelisted = {}
Greg Ward
run-tests: factor out parse_args(). Clarify use of globals a bit.
r8091
return (options, args)
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
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)
Martin Geisler
run-tests: removed some underscores (coding style)
r8097 def parsehghaveoutput(lines):
Nicolas Dumazet
run-tests: detect when hghave fails to check for a feature and fail test...
r8060 '''Parse hghave log lines.
Return tuple of lists (missing, failed):
* the missing/unknown features
* the features for which existence check failed'''
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 missing = []
Nicolas Dumazet
run-tests: detect when hghave fails to check for a feature and fail test...
r8060 failed = []
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881 for line in lines:
Nicolas Dumazet
run-tests: detect when hghave fails to check for a feature and fail test...
r8060 if line.startswith(SKIPPED_PREFIX):
line = line.splitlines()[0]
missing.append(line[len(SKIPPED_PREFIX):])
elif line.startswith(FAILED_PREFIX):
line = line.splitlines()[0]
failed.append(line[len(FAILED_PREFIX):])
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881
Nicolas Dumazet
run-tests: detect when hghave fails to check for a feature and fail test...
r8060 return missing, failed
Patrick Mezard
Add hghave utility and run-tests.py support....
r4881
Mads Kiilerich
run-tests.py: Show paths to failing tests, .err and .out...
r10088 def showdiff(expected, output, ref, err):
Idan Kamara
run-tests: print a new line before writing the diff
r14062 print
Simon Heimberg
run-tests: test result shows when a failed test could not start a server...
r21022 servefail = False
Mads Kiilerich
run-tests.py: Show paths to failing tests, .err and .out...
r10088 for line in difflib.unified_diff(expected, output, ref, err):
Vadim Gelfer
run-tests.py: fix handling of newlines....
r2247 sys.stdout.write(line)
Simon Heimberg
run-tests: test result shows when a failed test could not start a server...
r21022 if not servefail and line.startswith(
'+ abort: child process failed to start'):
servefail = True
return {'servefail': servefail}
Stephen Darnell
Add a pure python version of run-tests....
r2110
Matt Mackall
run-tests: make vlog a proper function
r19250 verbose = False
def vlog(*msg):
if verbose is not False:
iolock.acquire()
if verbose:
print verbose,
for m in msg:
print m,
print
sys.stdout.flush()
iolock.release()
Matt Mackall
run-tests: add a log function
r19251 def log(*msg):
iolock.acquire()
if verbose:
print verbose,
for m in msg:
print m,
print
sys.stdout.flush()
iolock.release()
Martin Geisler
run-tests: removed some underscores (coding style)
r8097 def findprogram(program):
Stephen Darnell
Add a pure python version of run-tests....
r2110 """Search PATH for a executable program"""
for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
name = os.path.join(p, program)
Patrick Mezard
run-tests: fix python executable detection and copy on Windows
r14335 if os.name == 'nt' or os.access(name, os.X_OK):
Stephen Darnell
Add a pure python version of run-tests....
r2110 return name
return None
Matt Mackall
run-tests: pull hgrc creation out as function
r19242 def createhgrc(path, options):
# create a fresh hgrc
Simon Heimberg
run-tests: open hgrc file only for writing...
r19299 hgrc = open(path, 'w')
Matt Mackall
run-tests: pull hgrc creation out as function
r19242 hgrc.write('[ui]\n')
hgrc.write('slash = True\n')
hgrc.write('interactive = False\n')
hgrc.write('[defaults]\n')
hgrc.write('backout = -d "0 0"\n')
hgrc.write('commit = -d "0 0"\n')
David Soria Parra
shelve: add a shelve extension to save/restore working changes...
r19854 hgrc.write('shelve = --date "0 0"\n')
Matt Mackall
run-tests: pull hgrc creation out as function
r19242 hgrc.write('tag = -d "0 0"\n')
if options.extra_config_opt:
for opt in options.extra_config_opt:
section, key = opt.split('.', 1)
assert '=' in key, ('extra config opt %s must '
'have an = for assignment' % opt)
hgrc.write('[%s]\n%s\n' % (section, key))
hgrc.close()
Martin Geisler
run-tests: removed some underscores (coding style)
r8097 def checktools():
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 # Before we go any further, check for pre-requisite tools
# stuff from coreutils (cat, rm, etc) are not tested
Martin Geisler
run-tests: removed some underscores (coding style)
r8097 for p in requiredtools:
Bryan O'Sullivan
run-tests: on windows, put correct python at front of PATH...
r18059 if os.name == 'nt' and not p.endswith('.exe'):
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 p += '.exe'
Martin Geisler
run-tests: removed some underscores (coding style)
r8097 found = findprogram(p)
Stephen Darnell
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
r2133 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
Thomas Arendsen Hein
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
r14821 def terminate(proc):
"""Terminate subprocess (with fallback for Python versions < 2.6)"""
vlog('# Terminating process %d' % proc.pid)
try:
Augie Fackler
tests: use getattr instead of hasattr
r14971 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
Thomas Arendsen Hein
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
r14821 except OSError:
pass
Matt Mackall
run-tests: use env dict to kill daemons
r19263 def killdaemons(pidfile):
return killmod.killdaemons(pidfile, tryhard=False, remove=True,
Patrick Mezard
run-tests: do not duplicate killdaemons() code
r17464 logfn=vlog)
Brendan Cully
run-tests: kill daemons on ^C with -j....
r10336
Gregory Szorc
run-tests: create classes for representing tests...
r21296 class Test(object):
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 """Encapsulates a single, runnable test.
Test instances can be run multiple times via run(). However, multiple
runs cannot be run concurrently.
"""
Gregory Szorc
run-tests: create classes for representing tests...
r21296
Gregory Szorc
run-tests: add options to runner
r21349 def __init__(self, runner, test, count, refpath):
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 path = os.path.join(runner.testdir, test)
errpath = os.path.join(runner.testdir, '%s.err' % test)
Gregory Szorc
run-tests: move computation of test paths into Test.__init__
r21338
Gregory Szorc
run-tests: move times global into TestRunner
r21358 self._runner = runner
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 self._testdir = runner.testdir
Gregory Szorc
run-tests: handle interrupted in Test.run()
r21320 self._test = test
Gregory Szorc
run-tests: create classes for representing tests...
r21296 self._path = path
Gregory Szorc
run-tests: add options to runner
r21349 self._options = runner.options
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 self._count = count
Gregory Szorc
run-tests: kill daemons during Test.cleanup()...
r21319 self._daemonpids = []
Gregory Szorc
run-tests: move err path handling to Test
r21321 self._refpath = refpath
self._errpath = errpath
Gregory Szorc
run-tests: create classes for representing tests...
r21296
Gregory Szorc
run-tests: capture reference output in Test.__init__...
r21318 # If we're not in --debug mode and reference output file exists,
# check test output against it.
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.debug:
Gregory Szorc
run-tests: capture reference output in Test.__init__...
r21318 self._refout = None # to match "out is None"
elif os.path.exists(refpath):
f = open(refpath, 'r')
self._refout = f.read().splitlines(True)
f.close()
else:
self._refout = []
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 self._threadtmp = os.path.join(runner.hgtmp, 'child%d' % count)
Gregory Szorc
run-tests: remove threadtmp in Test.cleanup()...
r21310 os.mkdir(self._threadtmp)
def cleanup(self):
Gregory Szorc
run-tests: kill daemons during Test.cleanup()...
r21319 for entry in self._daemonpids:
killdaemons(entry)
Gregory Szorc
run-tests: remove threadtmp in Test.cleanup()...
r21310 if self._threadtmp and not self._options.keep_tmpdir:
shutil.rmtree(self._threadtmp, True)
Gregory Szorc
run-tests: clean up temp directory variables...
r21304
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 def run(self):
Gregory Szorc
run-tests: check for test file existence in Test.run()...
r21328 if not os.path.exists(self._path):
return self.skip("Doesn't exist")
Gregory Szorc
run-tests: move blacklist skipping to Test.run()
r21329 options = self._options
if not (options.whitelisted and self._test in options.whitelisted):
if options.blacklist and self._test in options.blacklist:
return self.skip('blacklisted')
Gregory Szorc
run-tests: move retesting result to Test.run()
r21330 if options.retest and not os.path.exists('%s.err' % self._test):
return self.ignore('not retesting')
Gregory Szorc
run-tests: move keyword processing into Test.run()
r21331 if options.keywords:
f = open(self._test)
t = f.read().lower() + self._test.lower()
f.close()
for k in options.keywords.lower().split():
if k in t:
break
else:
return self.ignore("doesn't match keyword")
Gregory Szorc
run-tests: move test name filter to Test.run()
r21332 if not os.path.basename(self._test.lower()).startswith('test-'):
return self.skip('not a test file')
Gregory Szorc
run-tests: move err path handling to Test
r21321 # Remove any previous output files.
if os.path.exists(self._errpath):
os.remove(self._errpath)
Gregory Szorc
run-tests: remove threadtmp in Test.cleanup()...
r21310 testtmp = os.path.join(self._threadtmp, os.path.basename(self._path))
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 os.mkdir(testtmp)
replacements, port = self._getreplacements(testtmp)
env = self._getenv(testtmp, port)
Gregory Szorc
run-tests: kill daemons during Test.cleanup()...
r21319 self._daemonpids.append(env['DAEMON_PIDS'])
Gregory Szorc
run-tests: move blacklist skipping to Test.run()
r21329 createhgrc(env['HGRCPATH'], options)
Gregory Szorc
run-tests: move createhgrc() call into Test.run()...
r21300
Gregory Szorc
run-tests: move logging of test start into Test.run()
r21337 vlog('# Test', self._test)
Gregory Szorc
run-tests: capture execution results in a TestResult class...
r21305 starttime = time.time()
Gregory Szorc
run-tests: move killdaemons into Test.run()...
r21302 try:
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 ret, out = self._run(testtmp, replacements, env)
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 duration = time.time() - starttime
Gregory Szorc
run-tests: capture execution results in a TestResult class...
r21305 except KeyboardInterrupt:
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 duration = time.time() - starttime
log('INTERRUPTED: %s (after %d seconds)' % (self._test, duration))
Gregory Szorc
run-tests: handle interrupted in Test.run()
r21320 raise
Gregory Szorc
run-tests: capture execution results in a TestResult class...
r21305 except Exception, e:
Gregory Szorc
run-tests: emit exception failure result from Test.run()
r21333 return self.fail('Exception during execution: %s' % e, 255)
Gregory Szorc
run-tests: capture execution results in a TestResult class...
r21305
killdaemons(env['DAEMON_PIDS'])
Gregory Szorc
run-tests: move blacklist skipping to Test.run()
r21329 if not options.keep_tmpdir:
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 shutil.rmtree(testtmp)
Gregory Szorc
run-tests: move output difference processing to Test.run()
r21326 def describe(ret):
if ret < 0:
return 'killed by signal: %d' % -ret
return 'returned error code %d' % ret
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 skipped = False
Gregory Szorc
run-tests: add skip processing to Test
r21324 if ret == SKIPPED_STATUS:
if out is None: # Debug mode, nothing to parse.
missing = ['unknown']
failed = None
else:
missing, failed = parsehghaveoutput(out)
if not missing:
missing = ['irrelevant']
if failed:
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.fail('hg have failed checking for %s' % failed[-1],
ret)
Gregory Szorc
run-tests: add skip processing to Test
r21324 else:
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 skipped = True
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.skip(missing[-1])
Gregory Szorc
run-tests: generate timeout result in Test.run()
r21325 elif ret == 'timeout':
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.fail('timed out', ret)
Gregory Szorc
run-tests: move output difference processing to Test.run()
r21326 elif out != self._refout:
info = {}
Gregory Szorc
run-tests: move blacklist skipping to Test.run()
r21329 if not options.nodiff:
Gregory Szorc
run-tests: move output difference processing to Test.run()
r21326 iolock.acquire()
Gregory Szorc
run-tests: move blacklist skipping to Test.run()
r21329 if options.view:
os.system("%s %s %s" % (options.view, self._refpath,
Gregory Szorc
run-tests: move output difference processing to Test.run()
r21326 self._errpath))
else:
info = showdiff(self._refout, out, self._refpath,
self._errpath)
iolock.release()
msg = ''
if info.get('servefail'):
msg += 'serve failed and '
if ret:
msg += 'output changed and ' + describe(ret)
else:
msg += 'output changed'
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.fail(msg, ret)
Gregory Szorc
run-tests: move remaining result processing to Test.run()
r21327 elif ret:
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.fail(describe(ret), ret)
Gregory Szorc
run-tests: move remaining result processing to Test.run()
r21327 else:
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 res = self.success()
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336 if (ret != 0 or out != self._refout) and not skipped \
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 and not options.debug:
f = open(self._errpath, 'wb')
for line in out:
f.write(line)
f.close()
Gregory Szorc
run-tests: move output writing to Test.run()
r21335 vlog("# Ret was:", ret)
if not options.verbose:
iolock.acquire()
sys.stdout.write(res[0])
sys.stdout.flush()
iolock.release()
Gregory Szorc
run-tests: move times global into TestRunner
r21358 self._runner.times.append((self._test, duration))
Gregory Szorc
run-tests: remove remaining uses of TestResult
r21336
Gregory Szorc
run-tests: move err file saving to Test.run()
r21334 return res
Gregory Szorc
run-tests: add skip processing to Test
r21324
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 def _run(self, testtmp, replacements, env):
Gregory Szorc
run-tests: refactor runone() into gettest() and scheduletests()...
r21339 # This should be implemented in child classes to run tests.
return self._skip('unknown test type')
Gregory Szorc
run-tests: create classes for representing tests...
r21296
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 def _getreplacements(self, testtmp):
port = self._options.port + self._count * 3
Gregory Szorc
run-tests: move replacements generation into Test...
r21298 r = [
(r':%s\b' % port, ':$HGPORT'),
(r':%s\b' % (port + 1), ':$HGPORT1'),
(r':%s\b' % (port + 2), ':$HGPORT2'),
]
if os.name == 'nt':
r.append(
(''.join(c.isalpha() and '[%s%s]' % (c.lower(), c.upper()) or
c in '/\\' and r'[/\\]' or c.isdigit() and c or '\\' + c
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 for c in testtmp), '$TESTTMP'))
Gregory Szorc
run-tests: move replacements generation into Test...
r21298 else:
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 r.append((re.escape(testtmp), '$TESTTMP'))
Gregory Szorc
run-tests: move replacements generation into Test...
r21298
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 return r, port
Gregory Szorc
run-tests: move replacements generation into Test...
r21298
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 def _getenv(self, testtmp, port):
Gregory Szorc
run-tests: move createenv() into Test...
r21299 env = os.environ.copy()
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 env['TESTTMP'] = testtmp
env['HOME'] = testtmp
env["HGPORT"] = str(port)
env["HGPORT1"] = str(port + 1)
env["HGPORT2"] = str(port + 2)
Gregory Szorc
run-tests: remove threadtmp in Test.cleanup()...
r21310 env["HGRCPATH"] = os.path.join(self._threadtmp, '.hgrc')
env["DAEMON_PIDS"] = os.path.join(self._threadtmp, 'daemon.pids')
Gregory Szorc
run-tests: move createenv() into Test...
r21299 env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
env["HGMERGE"] = "internal:merge"
env["HGUSER"] = "test"
env["HGENCODING"] = "ascii"
env["HGENCODINGMODE"] = "strict"
# Reset some environment variables to well-known values so that
# the tests produce repeatable output.
env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
env['TZ'] = 'GMT'
env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
env['COLUMNS'] = '80'
env['TERM'] = 'xterm'
for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
'NO_PROXY').split():
if k in env:
del env[k]
# unset env related to hooks
for k in env.keys():
if k.startswith('HG_'):
del env[k]
return env
Gregory Szorc
run-tests: move success() into Test
r21322 def success(self):
return '.', self._test, ''
Gregory Szorc
run-tests: move fail() into Test...
r21323 def fail(self, msg, ret):
warned = ret is False
if not self._options.nodiff:
log("\n%s: %s %s" % (warned and 'Warning' or 'ERROR', self._test,
msg))
if (not ret and self._options.interactive and
os.path.exists(self._errpath)):
iolock.acquire()
print 'Accept this change? [n] ',
answer = sys.stdin.readline().strip()
iolock.release()
if answer.lower() in ('y', 'yes').split():
if self._test.endswith('.t'):
rename(self._errpath, self._testpath)
else:
rename(self._errpath, '%s.out' % self._testpath)
return '.', self._test, ''
return warned and '~' or '!', self._test, msg
Gregory Szorc
run-tests: add skip processing to Test
r21324 def skip(self, msg):
if self._options.verbose:
log("\nSkipping %s: %s" % (self._path, msg))
return 's', self._test, msg
Gregory Szorc
run-tests: move retesting result to Test.run()
r21330 def ignore(self, msg):
return 'i', self._test, msg
Gregory Szorc
run-tests: create classes for representing tests...
r21296 class PythonTest(Test):
"""A Python-based test."""
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 def _run(self, testtmp, replacements, env):
Gregory Szorc
run-tests: roll pytest() into PythonTest._run()...
r21311 py3kswitch = self._options.py3k_warnings and ' -3' or ''
cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self._path)
vlog("# Running", cmd)
if os.name == 'nt':
replacements.append((r'\r\n', '\n'))
return run(cmd, testtmp, self._options, replacements, env)
Gregory Szorc
run-tests: create classes for representing tests...
r21296
Mads Kiilerich
tests: use (esc) markup for string-escape...
r12941 needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
escapemap.update({'\\': '\\\\', '\r': r'\r'})
def escapef(m):
return escapemap[m.group(0)]
def stringescape(s):
return escapesub(escapef, s)
Gregory Szorc
run-tests: create classes for representing tests...
r21296 class TTest(Test):
"""A "t test" is a test backed by a .t file."""
Gregory Szorc
run-tests: allow Test.run() to run multiple times...
r21309 def _run(self, testtmp, replacements, env):
Gregory Szorc
run-tests: move t test execution from tsttest() to TTest.run()...
r21313 f = open(self._path)
lines = f.readlines()
f.close()
salt, script, after, expected = self._parsetest(lines, testtmp)
# Write out the generated script.
fname = '%s.sh' % testtmp
f = open(fname, 'w')
for l in script:
f.write(l)
f.close()
cmd = '%s "%s"' % (self._options.shell, fname)
vlog("# Running", cmd)
exitcode, output = run(cmd, testtmp, self._options, replacements, env)
# Do not merge output if skipped. Return hghave message instead.
# Similarly, with --debug, output is None.
if exitcode == SKIPPED_STATUS or output is None:
return exitcode, output
Gregory Szorc
run-tests: finish moving tsttest() into TTest
r21314 return self._processoutput(exitcode, output, salt, after, expected)
Gregory Szorc
run-tests: create classes for representing tests...
r21296
Gregory Szorc
run-tests: move t test parsing into its own function...
r21312 def _hghave(self, reqs, testtmp):
# TODO do something smarter when all other uses of hghave are gone.
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 tdir = self._testdir.replace('\\', '/')
Gregory Szorc
run-tests: move t test parsing into its own function...
r21312 proc = Popen4('%s -c "%s/hghave %s"' %
(self._options.shell, tdir, ' '.join(reqs)),
testtmp, 0)
stdout, stderr = proc.communicate()
ret = proc.wait()
if wifexited(ret):
ret = os.WEXITSTATUS(ret)
if ret == 2:
print stdout
sys.exit(1)
return ret == 0
def _parsetest(self, lines, testtmp):
# We generate a shell script which outputs unique markers to line
# up script results with our source. These markers include input
# line number and the last return code.
salt = "SALT" + str(time.time())
def addsalt(line, inpython):
if inpython:
script.append('%s %d 0\n' % (salt, line))
else:
script.append('echo %s %s $?\n' % (salt, line))
script = []
# After we run the shell script, we re-unify the script output
# with non-active parts of the source, with synchronization by our
# SALT line number markers. The after table contains the non-active
# components, ordered by line number.
after = {}
# Expected shell script output.
expected = {}
pos = prepos = -1
# True or False when in a true or false conditional section
skipping = None
# We keep track of whether or not we're in a Python block so we
# can generate the surrounding doctest magic.
inpython = False
if self._options.debug:
script.append('set -x\n')
if os.getenv('MSYSTEM'):
script.append('alias pwd="pwd -W"\n')
for n, l in enumerate(lines):
if not l.endswith('\n'):
l += '\n'
if l.startswith('#if'):
lsplit = l.split()
if len(lsplit) < 2 or lsplit[0] != '#if':
after.setdefault(pos, []).append(' !!! invalid #if\n')
if skipping is not None:
after.setdefault(pos, []).append(' !!! nested #if\n')
skipping = not self._hghave(lsplit[1:], testtmp)
after.setdefault(pos, []).append(l)
elif l.startswith('#else'):
if skipping is None:
after.setdefault(pos, []).append(' !!! missing #if\n')
skipping = not skipping
after.setdefault(pos, []).append(l)
elif l.startswith('#endif'):
if skipping is None:
after.setdefault(pos, []).append(' !!! missing #if\n')
skipping = None
after.setdefault(pos, []).append(l)
elif skipping:
after.setdefault(pos, []).append(l)
elif l.startswith(' >>> '): # python inlines
after.setdefault(pos, []).append(l)
prepos = pos
pos = n
if not inpython:
# We've just entered a Python block. Add the header.
inpython = True
addsalt(prepos, False) # Make sure we report the exit code.
script.append('%s -m heredoctest <<EOF\n' % PYTHON)
addsalt(n, True)
script.append(l[2:])
elif l.startswith(' ... '): # python inlines
after.setdefault(prepos, []).append(l)
script.append(l[2:])
elif l.startswith(' $ '): # commands
if inpython:
script.append('EOF\n')
inpython = False
after.setdefault(pos, []).append(l)
prepos = pos
pos = n
addsalt(n, False)
cmd = l[4:].split()
if len(cmd) == 2 and cmd[0] == 'cd':
l = ' $ cd %s || exit 1\n' % cmd[1]
script.append(l[4:])
elif l.startswith(' > '): # continuations
after.setdefault(prepos, []).append(l)
script.append(l[4:])
elif l.startswith(' '): # results
# Queue up a list of expected results.
expected.setdefault(pos, []).append(l[2:])
else:
if inpython:
script.append('EOF\n')
inpython = False
# Non-command/result. Queue up for merged output.
after.setdefault(pos, []).append(l)
if inpython:
script.append('EOF\n')
if skipping is not None:
after.setdefault(pos, []).append(' !!! missing #endif\n')
addsalt(n + 1, False)
return salt, script, after, expected
Gregory Szorc
run-tests: finish moving tsttest() into TTest
r21314 def _processoutput(self, exitcode, output, salt, after, expected):
# Merge the script output back into a unified test.
warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
if exitcode != 0:
warnonly = 3
pos = -1
postout = []
for l in output:
lout, lcmd = l, None
if salt in l:
lout, lcmd = l.split(salt, 1)
if lout:
if not lout.endswith('\n'):
lout += ' (no-eol)\n'
# Find the expected output at the current position.
el = None
if expected.get(pos, None):
el = expected[pos].pop(0)
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 r = TTest.linematch(el, lout)
Gregory Szorc
run-tests: finish moving tsttest() into TTest
r21314 if isinstance(r, str):
if r == '+glob':
lout = el[:-1] + ' (glob)\n'
r = '' # Warn only this line.
elif r == '-glob':
lout = ''.join(el.rsplit(' (glob)', 1))
r = '' # Warn only this line.
else:
log('\ninfo, unknown linematch result: %r\n' % r)
r = False
if r:
postout.append(' ' + el)
else:
if needescape(lout):
lout = stringescape(lout.rstrip('\n')) + ' (esc)\n'
postout.append(' ' + lout) # Let diff deal with it.
if r != '': # If line failed.
warnonly = 3 # for sure not
elif warnonly == 1: # Is "not yet" and line is warn only.
warnonly = 2 # Yes do warn.
if lcmd:
# Add on last return code.
ret = int(lcmd.split()[1])
if ret != 0:
postout.append(' [%s]\n' % ret)
if pos in after:
# Merge in non-active test bits.
postout += after.pop(pos)
pos = int(lcmd.split()[0])
if pos in after:
postout += after.pop(pos)
if warnonly == 2:
exitcode = False # Set exitcode to warned.
return exitcode, postout
Gregory Szorc
run-tests: move t test parsing into its own function...
r21312
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 @staticmethod
Gregory Szorc
run-tests: make rematch a static method of TTest
r21316 def rematch(el, l):
try:
# use \Z to ensure that the regex matches to the end of the string
if os.name == 'nt':
return re.match(el + r'\r?\n\Z', l)
return re.match(el + r'\n\Z', l)
except re.error:
# el is an invalid regex
return False
@staticmethod
Gregory Szorc
run-tests: make globmatch a static method of TTest
r21317 def globmatch(el, l):
# The only supported special characters are * and ? plus / which also
# matches \ on windows. Escaping of these characters is supported.
if el + '\n' == l:
if os.altsep:
# matching on "/" is not needed for this line
return '-glob'
return True
i, n = 0, len(el)
res = ''
while i < n:
c = el[i]
i += 1
if c == '\\' and el[i] in '*?\\/':
res += el[i - 1:i + 1]
i += 1
elif c == '*':
res += '.*'
elif c == '?':
res += '.'
elif c == '/' and os.altsep:
res += '[/\\\\]'
else:
res += re.escape(c)
return TTest.rematch(res, l)
@staticmethod
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 def linematch(el, l):
if el == l: # perfect match (fast)
return True
if el:
if el.endswith(" (esc)\n"):
el = el[:-7].decode('string-escape') + '\n'
if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
return True
if el.endswith(" (re)\n"):
Gregory Szorc
run-tests: make rematch a static method of TTest
r21316 return TTest.rematch(el[:-6], l)
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 if el.endswith(" (glob)\n"):
Gregory Szorc
run-tests: make globmatch a static method of TTest
r21317 return TTest.globmatch(el[:-8], l)
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 if os.altsep and l.replace('\\', '/') == el:
return '+glob'
return False
Simon Heimberg
run-tests: only call WIFEXITED on systems it exists...
r13348 wifexited = getattr(os, "WIFEXITED", lambda x: False)
Matt Mackall
run-tests: add env dict to isolate test environment
r19262 def run(cmd, wd, options, replacements, env):
Stephen Darnell
Add a pure python version of run-tests....
r2110 """Run command in a sub-process, capturing the output (stdout and stderr).
Greg Ward
run-tests: add "debug" mode: don't capture child output, just show it....
r9707 Return a tuple (exitcode, output). output is None in debug mode."""
Stephen Darnell
Add a pure python version of run-tests....
r2110 # TODO: Use subprocess.Popen if we're running on Python 2.4
Greg Ward
run-tests: add "debug" mode: don't capture child output, just show it....
r9707 if options.debug:
Matt Mackall
run-tests: add env dict to isolate test environment
r19262 proc = subprocess.Popen(cmd, shell=True, cwd=wd, env=env)
Greg Ward
run-tests: add "debug" mode: don't capture child output, just show it....
r9707 ret = proc.wait()
return (ret, None)
Matt Mackall
run-tests: add env dict to isolate test environment
r19262 proc = Popen4(cmd, wd, options.timeout, env)
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 def cleanup():
Thomas Arendsen Hein
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
r14821 terminate(proc)
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 ret = proc.wait()
if ret == 0:
ret = signal.SIGTERM << 8
Matt Mackall
run-tests: use env dict to kill daemons
r19263 killdaemons(env['DAEMON_PIDS'])
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 return ret
output = ''
proc.tochild.close()
Brendan Cully
run-tests: kill daemons on ^C with -j....
r10336
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 try:
output = proc.fromchild.read()
except KeyboardInterrupt:
vlog('# Handling keyboard interrupt')
cleanup()
raise
Brendan Cully
run-tests: kill daemons on ^C with -j....
r10336
Brendan Cully
run-tests: lock popen wait/poll...
r19413 ret = proc.wait()
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 if wifexited(ret):
ret = os.WEXITSTATUS(ret)
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 if proc.timeout:
ret = 'timeout'
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001
Patrick Mezard
run-tests: use the common test path on Windows and Java...
r14338 if ret:
Matt Mackall
run-tests: use env dict to kill daemons
r19263 killdaemons(env['DAEMON_PIDS'])
Matt Mackall
run-tests: switch timeout handling from alarm to helper thread...
r14001
Matt Mackall
run-tests: add abort flag...
r19273 if abort:
raise KeyboardInterrupt()
Mads Kiilerich
tests: replace test tmp directory with $TESTTMP in test output...
r12639 for s, r in replacements:
Martin Geisler
run-tests: use regex when searching for $HGPORT in test output...
r12895 output = re.sub(s, r, output)
Mads Kiilerich
run-tests: allow test output lines to be terminated with \r in addition to \n...
r17742 return ret, output.splitlines(True)
Stephen Darnell
Add a pure python version of run-tests....
r2110
Greg Ward
run-tests: factor out _checkhglib() to check import path of 'mercurial'....
r8672 _hgpath = None
def _gethgpath():
"""Return the path to the mercurial package that is actually found by
the current Python interpreter."""
global _hgpath
if _hgpath is not None:
return _hgpath
Augie Fackler
run-tests: find mercurial path with syntax valid on both py2 and py3
r19759 cmd = '%s -c "import mercurial; print (mercurial.__path__[0])"'
Greg Ward
run-tests: factor out _checkhglib() to check import path of 'mercurial'....
r8672 pipe = os.popen(cmd % PYTHON)
try:
_hgpath = pipe.read().strip()
finally:
pipe.close()
return _hgpath
Matt Mackall
run-tests: add a lock for console I/O
r14002 iolock = threading.Lock()
Matt Mackall
run-tests: add abort flag...
r19273 abort = False
Matt Mackall
run-tests: add locking on results struct
r14000
Gregory Szorc
run-tests: add options to runner
r21349 def scheduletests(runner, tests):
jobs = runner.options.jobs
Matt Mackall
run-tests: introduce thread scheduler
r19276 done = queue.Queue()
running = 0
count = 0
global abort
def job(test, count):
try:
Gregory Szorc
run-tests: move gettest() into TestRunner
r21357 t = runner.gettest(test, count)
Gregory Szorc
run-tests: refactor runone() into gettest() and scheduletests()...
r21339 done.put(t.run())
t.cleanup()
Matt Mackall
run-tests: introduce thread scheduler
r19276 except KeyboardInterrupt:
pass
Simon Heimberg
run-tests: report tests as failed when run-test raises an error...
r20258 except: # re-raises
done.put(('!', test, 'run-test raised an error, see traceback'))
raise
Matt Mackall
run-tests: change return code of runone
r19248
Matt Mackall
run-tests: introduce thread scheduler
r19276 try:
while tests or running:
if not done.empty() or running == jobs or not tests:
try:
code, test, msg = done.get(True, 1)
Gregory Szorc
run-tests: move results global into TestRunner
r21359 runner.results[code].append((test, msg))
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.first and code not in '.si':
Matt Mackall
run-tests: introduce thread scheduler
r19276 break
except queue.Empty:
continue
running -= 1
if tests and not running == jobs:
test = tests.pop(0)
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.loop:
Matt Mackall
run-tests: add --loop support...
r19283 tests.append(test)
Simon Heimberg
run-tests: set the thread name to the test name for info on error...
r20259 t = threading.Thread(target=job, name=test, args=(test, count))
Matt Mackall
run-tests: introduce thread scheduler
r19276 t.start()
running += 1
count += 1
except KeyboardInterrupt:
abort = True
Matt Mackall
run-tests: move test loop into a helper function
r13995
Gregory Szorc
run-tests: add options to runner
r21349 def runtests(runner, tests):
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 try:
Gregory Szorc
run-tests: move INST out of a global
r21343 if runner.inst:
Gregory Szorc
run-tests: move installhg() into TestRunner
r21353 runner.installhg()
Gregory Szorc
run-tests: move checkhglib into TestRunner
r21354 runner.checkhglib("Testing")
Bryan O'Sullivan
run-tests: use correct python when run with --local
r18048 else:
Gregory Szorc
run-tests: move usecorrectpython() into TestRunner
r21351 runner.usecorrectpython()
Dirkjan Ochtman
imported patch test-check
r6982
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.restart:
Matt Mackall
tests: add -R switch...
r3625 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
Gregory Szorc
run-tests: add options to runner
r21349 scheduletests(runner, tests)
Matt Mackall
tests: add -R switch...
r3625
Gregory Szorc
run-tests: move results global into TestRunner
r21359 failed = len(runner.results['!'])
warned = len(runner.results['~'])
tested = len(runner.results['.']) + failed + warned
skipped = len(runner.results['s'])
ignored = len(runner.results['i'])
Matt Mackall
run-tests: use a results dict
r13994
Matt Mackall
run-tests: drop options.child and users
r19279 print
Gregory Szorc
run-tests: add options to runner
r21349 if not runner.options.noskips:
Gregory Szorc
run-tests: move results global into TestRunner
r21359 for s in runner.results['s']:
Matt Mackall
run-tests: make --noskips work
r19294 print "Skipped %s: %s" % s
Gregory Szorc
run-tests: move results global into TestRunner
r21359 for s in runner.results['~']:
Simon Heimberg
run-tests: introduce 'warned' as test result...
r20506 print "Warned %s: %s" % s
Gregory Szorc
run-tests: move results global into TestRunner
r21359 for s in runner.results['!']:
Matt Mackall
run-tests: drop options.child and users
r19279 print "Failed %s: %s" % s
Gregory Szorc
run-tests: move checkhglib into TestRunner
r21354 runner.checkhglib("Tested")
Simon Heimberg
run-tests: introduce 'warned' as test result...
r20506 print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
tested, skipped + ignored, warned, failed)
Gregory Szorc
run-tests: move results global into TestRunner
r21359 if runner.results['!']:
Mads Kiilerich
tests: python hash seed is only relevant after failures - otherwise keep quiet
r20046 print 'python hash seed:', os.environ['PYTHONHASHSEED']
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.time:
Gregory Szorc
run-tests: move outputtimes() into TestRunner
r21355 runner.outputtimes()
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
Gregory Szorc
run-tests: add options to runner
r21349 if runner.options.anycoverage:
Gregory Szorc
run-tests: move outputcoverage() into TestRunner
r21356 runner.outputcoverage()
Benoit Boissinot
catch KeyboardInterrupt in run-tests
r2258 except KeyboardInterrupt:
failed = True
Matt Mackall
run-tests: drop options.child and users
r19279 print "\ninterrupted!"
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
Matt Mackall
run-tests: use a results dict
r13994 if failed:
Simon Heimberg
run-tests: handle sys.exit in main function
r20505 return 1
Simon Heimberg
run-tests: separate exit code when no failed tests but warned ones...
r20507 if warned:
return 80
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
Gregory Szorc
run-tests: establish a class to hold testing state
r21340 class TestRunner(object):
"""Holds context for executing tests.
Tests rely on a lot of state. This object holds it for them.
"""
Gregory Szorc
run-tests: move gettest() into TestRunner
r21357
TESTTYPES = [
('.py', PythonTest, '.out'),
('.t', TTest, ''),
]
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 def __init__(self):
Gregory Szorc
run-tests: add options to runner
r21348 self.options = None
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 self.testdir = None
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 self.hgtmp = None
Gregory Szorc
run-tests: move INST out of a global
r21343 self.inst = None
Gregory Szorc
run-tests: move BINDIR out of a global
r21344 self.bindir = None
Gregory Szorc
run-tests: move TMPBINDIR out of a global
r21345 self.tmpbinddir = None
Gregory Szorc
run-tests: move PYTHONDIR out of a global
r21346 self.pythondir = None
Gregory Szorc
run-tests: move COVERAGE_FILE out of a global
r21347 self.coveragefile = None
Gregory Szorc
run-tests: move times global into TestRunner
r21358 self.times = [] # Holds execution times of tests.
Gregory Szorc
run-tests: move results global into TestRunner
r21359 self.results = {
'.': [],
'!': [],
'~': [],
's': [],
'i': [],
}
Gregory Szorc
run-tests: move createdfiles out of a global and into TestRunner
r21352 self._createdfiles = []
Gregory Szorc
run-tests: establish a class to hold testing state
r21340
Gregory Szorc
run-tests: move gettest() into TestRunner
r21357 def gettest(self, test, count):
"""Obtain a Test by looking at its filename.
Returns a Test instance. The Test may not be runnable if it doesn't
map to a known type.
"""
lctest = test.lower()
refpath = os.path.join(self.testdir, test)
testcls = Test
for ext, cls, out in self.TESTTYPES:
if lctest.endswith(ext):
testcls = cls
refpath = os.path.join(self.testdir, test + out)
break
return testcls(self, test, count, refpath)
Gregory Szorc
run-tests: move cleanup() into TestRunner
r21350 def cleanup(self):
"""Clean up state from this test invocation."""
if self.options.keep_tmpdir:
return
vlog("# Cleaning up HGTMP", self.hgtmp)
shutil.rmtree(self.hgtmp, True)
Gregory Szorc
run-tests: move createdfiles out of a global and into TestRunner
r21352 for f in self._createdfiles:
Gregory Szorc
run-tests: move cleanup() into TestRunner
r21350 try:
os.remove(f)
except OSError:
pass
Gregory Szorc
run-tests: move usecorrectpython() into TestRunner
r21351 def usecorrectpython(self):
# Some tests run the Python interpreter. They must use the
# same interpreter or bad things will happen.
pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
if getattr(os, 'symlink', None):
vlog("# Making python executable in test path a symlink to '%s'" %
sys.executable)
mypython = os.path.join(self.tmpbindir, pyexename)
try:
if os.readlink(mypython) == sys.executable:
return
os.unlink(mypython)
except OSError, err:
if err.errno != errno.ENOENT:
raise
if findprogram(pyexename) != sys.executable:
try:
os.symlink(sys.executable, mypython)
Gregory Szorc
run-tests: move createdfiles out of a global and into TestRunner
r21352 self._createdfiles.append(mypython)
Gregory Szorc
run-tests: move usecorrectpython() into TestRunner
r21351 except OSError, err:
# child processes may race, which is harmless
if err.errno != errno.EEXIST:
raise
else:
exedir, exename = os.path.split(sys.executable)
vlog("# Modifying search path to find %s as %s in '%s'" %
(exename, pyexename, exedir))
path = os.environ['PATH'].split(os.pathsep)
while exedir in path:
path.remove(exedir)
os.environ['PATH'] = os.pathsep.join([exedir] + path)
if not findprogram(pyexename):
print "WARNING: Cannot find %s in search path" % pyexename
Gregory Szorc
run-tests: move installhg() into TestRunner
r21353 def installhg(self):
vlog("# Performing temporary installation of HG")
installerrs = os.path.join("tests", "install.err")
compiler = ''
if self.options.compiler:
compiler = '--compiler ' + self.options.compiler
pure = self.options.pure and "--pure" or ""
py3 = ''
if sys.version_info[0] == 3:
py3 = '--c2to3'
# Run installer in hg root
script = os.path.realpath(sys.argv[0])
hgroot = os.path.dirname(os.path.dirname(script))
os.chdir(hgroot)
nohome = '--home=""'
if os.name == 'nt':
# The --home="" trick works only on OS where os.sep == '/'
# because of a distutils convert_path() fast-path. Avoid it at
# least on Windows for now, deal with .pydistutils.cfg bugs
# when they happen.
nohome = ''
cmd = ('%(exe)s setup.py %(py3)s %(pure)s clean --all'
' build %(compiler)s --build-base="%(base)s"'
' install --force --prefix="%(prefix)s"'
' --install-lib="%(libdir)s"'
' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
% {'exe': sys.executable, 'py3': py3, 'pure': pure,
'compiler': compiler,
'base': os.path.join(self.hgtmp, "build"),
'prefix': self.inst, 'libdir': self.pythondir,
'bindir': self.bindir,
'nohome': nohome, 'logfile': installerrs})
vlog("# Running", cmd)
if os.system(cmd) == 0:
if not self.options.verbose:
os.remove(installerrs)
else:
f = open(installerrs)
for line in f:
print line,
f.close()
sys.exit(1)
os.chdir(self.testdir)
self.usecorrectpython()
if self.options.py3k_warnings and not self.options.anycoverage:
vlog("# Updating hg command to enable Py3k Warnings switch")
f = open(os.path.join(self.bindir, 'hg'), 'r')
lines = [line.rstrip() for line in f]
lines[0] += ' -3'
f.close()
f = open(os.path.join(self.bindir, 'hg'), 'w')
for line in lines:
f.write(line + '\n')
f.close()
hgbat = os.path.join(self.bindir, 'hg.bat')
if os.path.isfile(hgbat):
# hg.bat expects to be put in bin/scripts while run-tests.py
# installation layout put it in bin/ directly. Fix it
f = open(hgbat, 'rb')
data = f.read()
f.close()
if '"%~dp0..\python" "%~dp0hg" %*' in data:
data = data.replace('"%~dp0..\python" "%~dp0hg" %*',
'"%~dp0python" "%~dp0hg" %*')
f = open(hgbat, 'wb')
f.write(data)
f.close()
else:
print 'WARNING: cannot fix hg.bat reference to python.exe'
if self.options.anycoverage:
custom = os.path.join(self.testdir, 'sitecustomize.py')
target = os.path.join(self.pythondir, 'sitecustomize.py')
vlog('# Installing coverage trigger to %s' % target)
shutil.copyfile(custom, target)
rc = os.path.join(self.testdir, '.coveragerc')
vlog('# Installing coverage rc to %s' % rc)
os.environ['COVERAGE_PROCESS_START'] = rc
fn = os.path.join(self.inst, '..', '.coverage')
os.environ['COVERAGE_FILE'] = fn
Gregory Szorc
run-tests: move checkhglib into TestRunner
r21354 def checkhglib(self, verb):
"""Ensure that the 'mercurial' package imported by python is
the one we expect it to be. If not, print a warning to stderr."""
expecthg = os.path.join(self.pythondir, 'mercurial')
actualhg = _gethgpath()
if os.path.abspath(actualhg) != os.path.abspath(expecthg):
sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
' (expected %s)\n'
% (verb, actualhg, expecthg))
Gregory Szorc
run-tests: move outputtimes() into TestRunner
r21355 def outputtimes(self):
vlog('# Producing time report')
Gregory Szorc
run-tests: move times global into TestRunner
r21358 self.times.sort(key=lambda t: (t[1], t[0]), reverse=True)
Gregory Szorc
run-tests: move outputtimes() into TestRunner
r21355 cols = '%7.3f %s'
print '\n%-7s %s' % ('Time', 'Test')
Gregory Szorc
run-tests: move times global into TestRunner
r21358 for test, timetaken in self.times:
Gregory Szorc
run-tests: move outputtimes() into TestRunner
r21355 print cols % (timetaken, test)
Gregory Szorc
run-tests: move outputcoverage() into TestRunner
r21356 def outputcoverage(self):
vlog('# Producing coverage report')
os.chdir(self.pythondir)
def covrun(*args):
cmd = 'coverage %s' % ' '.join(args)
vlog('# Running: %s' % cmd)
os.system(cmd)
covrun('-c')
omit = ','.join(os.path.join(x, '*') for x in
[self.bindir, self.testdir])
covrun('-i', '-r', '"--omit=%s"' % omit) # report
if self.options.htmlcov:
htmldir = os.path.join(self.testdir, 'htmlcov')
covrun('-i', '-b', '"--directory=%s"' % htmldir,
'"--omit=%s"' % omit)
if self.options.annotate:
adir = os.path.join(self.testdir, 'annotated')
if not os.path.isdir(adir):
os.mkdir(adir)
covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
Gregory Szorc
run-tests: allow option parser to be extended...
r21008 def main(args, parser=None):
Gregory Szorc
run-tests: establish a class to hold testing state
r21340 runner = TestRunner()
Gregory Szorc
run-tests: allow option parser to be extended...
r21008 parser = parser or getparser()
(options, args) = parseargs(args, parser)
Gregory Szorc
run-tests: add options to runner
r21348 runner.options = options
Matt Mackall
run-tests: drop options.child and users
r19279 os.umask(022)
Greg Ward
run-tests: move bits of main program so it's all at the bottom.
r8093
Matt Mackall
run-tests: drop options.child and users
r19279 checktools()
Greg Ward
run-tests: move bits of main program so it's all at the bottom.
r8093
Mads Kiilerich
tests: small refactoring of run-tests' handling of tests list
r20793 if not args:
Mads Kiilerich
tests: add run-tests --changed option for running tests changed in revisions...
r20821 if options.changed:
proc = Popen4('hg st --rev "%s" -man0 .' % options.changed,
None, 0)
stdout, stderr = proc.communicate()
args = stdout.strip('\0').split('\0')
else:
args = os.listdir(".")
Benoit Boissinot
run-tests.py: do not install hg when the tests do no exist
r12677
Mads Kiilerich
tests: small refactoring of run-tests' handling of tests list
r20793 tests = [t for t in args
Gregory Szorc
run-tests: allow test paths in other directories...
r21009 if os.path.basename(t).startswith("test-")
and (t.endswith(".py") or t.endswith(".t"))]
Benoit Boissinot
run-tests.py: do not install hg when the tests do no exist
r12677
Mads Kiilerich
run-tests: introduce --random for running tests in random error...
r19057 if options.random:
random.shuffle(tests)
Matt Mackall
run-tests: schedule largest tests first
r19277 else:
Matt Mackall
run-tests: sort certain slow tests earlier by keyword...
r19281 # keywords for slow tests
slow = 'svn gendoc check-code-hg'.split()
def sortkey(f):
# run largest tests first, as they tend to take the longest
simon@laptop-tosh
run-tests: sort missing files first instead of raising an error...
r19315 try:
val = -os.stat(f).st_size
except OSError, e:
if e.errno != errno.ENOENT:
raise
return -1e9 # file does not exist, tell early
Matt Mackall
run-tests: sort certain slow tests earlier by keyword...
r19281 for kw in slow:
if kw in f:
val *= 10
return val
tests.sort(key=sortkey)
Mads Kiilerich
run-tests: introduce --random for running tests in random error...
r19057
Pierre-Yves David
test: display used python hash seed...
r18616 if 'PYTHONHASHSEED' not in os.environ:
# use a random python hash seed all the time
# we do the randomness ourself to know what seed is used
os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
Greg Ward
run-tests: move bits of main program so it's all at the bottom.
r8093
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 runner.testdir = os.environ['TESTDIR'] = os.getcwd()
Greg Ward
run-tests: make --tmpdir option more useful....
r9706 if options.tmpdir:
Matt Mackall
run-tests: drop options.child and users
r19279 options.keep_tmpdir = True
Greg Ward
run-tests: make --tmpdir option more useful....
r9706 tmpdir = options.tmpdir
if os.path.exists(tmpdir):
# Meaning of tmpdir has changed since 1.3: we used to create
# HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
# tmpdir already exists.
Gregory Szorc
run-tests: use return values instead of sys.exit
r21007 print "error: temp dir %r already exists" % tmpdir
return 1
Greg Ward
run-tests: make --tmpdir option more useful....
r9706
# Automatically removing tmpdir sounds convenient, but could
# really annoy anyone in the habit of using "--tmpdir=/tmp"
# or "--tmpdir=$HOME".
#vlog("# Removing temp dir", tmpdir)
#shutil.rmtree(tmpdir)
os.makedirs(tmpdir)
else:
Adrian Buehlmann
tests/run-tests: use $TMP on Windows (issue3490)...
r16890 d = None
if os.name == 'nt':
# without this, we get the default temp dir location, but
# in all lowercase, which causes troubles with paths (issue3490)
d = os.getenv('TMP')
tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 runner.hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)
Greg Ward
run-tests: move bits of main program so it's all at the bottom.
r8093
Greg Ward
run-tests: factor out main(); reduce use of globals a bit.
r8094 if options.with_hg:
Gregory Szorc
run-tests: move INST out of a global
r21343 runner.inst = None
Gregory Szorc
run-tests: move BINDIR out of a global
r21344 runner.bindir = os.path.dirname(os.path.realpath(options.with_hg))
Gregory Szorc
run-tests: move TMPBINDIR out of a global
r21345 runner.tmpbindir = os.path.join(runner.hgtmp, 'install', 'bin')
os.makedirs(runner.tmpbindir)
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674
# This looks redundant with how Python initializes sys.path from
# the location of the script being executed. Needed because the
# "hg" specified by --with-hg is not the only Python script
# executed in the test suite that needs to import 'mercurial'
# ... which means it's not really redundant at all.
Gregory Szorc
run-tests: move PYTHONDIR out of a global
r21346 runner.pythondir = runner.bindir
Greg Ward
run-tests: factor out main(); reduce use of globals a bit.
r8094 else:
Gregory Szorc
run-tests: move INST out of a global
r21343 runner.inst = os.path.join(runner.hgtmp, "install")
Gregory Szorc
run-tests: move BINDIR out of a global
r21344 runner.bindir = os.environ["BINDIR"] = os.path.join(runner.inst,
"bin")
Gregory Szorc
run-tests: move TMPBINDIR out of a global
r21345 runner.tmpbindir = runner.bindir
Gregory Szorc
run-tests: move PYTHONDIR out of a global
r21346 runner.pythondir = os.path.join(runner.inst, "lib", "python")
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674
Gregory Szorc
run-tests: move BINDIR out of a global
r21344 os.environ["BINDIR"] = runner.bindir
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 os.environ["PYTHON"] = PYTHON
Gregory Szorc
run-tests: move BINDIR out of a global
r21344 path = [runner.bindir] + os.environ["PATH"].split(os.pathsep)
Gregory Szorc
run-tests: move TMPBINDIR out of a global
r21345 if runner.tmpbindir != runner.bindir:
path = [runner.tmpbindir] + path
Matt Mackall
run-tests: drop options.child and users
r19279 os.environ["PATH"] = os.pathsep.join(path)
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674
Matt Mackall
run-tests: drop options.child and users
r19279 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
# can run .../tests/run-tests.py test-foo where test-foo
Patrick Mezard
run-tests: fix heredoctest for out-of-tree extensions...
r20513 # adds an extension to HGRC. Also include run-test.py directory to import
# modules like heredoctest.
Gregory Szorc
run-tests: move PYTHONDIR out of a global
r21346 pypath = [runner.pythondir, runner.testdir,
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 os.path.abspath(os.path.dirname(__file__))]
Matt Mackall
run-tests: drop options.child and users
r19279 # We have to augment PYTHONPATH, rather than simply replacing
# it, in case external libraries are only available via current
# PYTHONPATH. (In particular, the Subversion bindings on OS X
# are in /opt/subversion.)
oldpypath = os.environ.get(IMPL_PATH)
if oldpypath:
pypath.append(oldpypath)
os.environ[IMPL_PATH] = os.pathsep.join(pypath)
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674
Gregory Szorc
run-tests: move COVERAGE_FILE out of a global
r21347 runner.coveragefile = os.path.join(runner.testdir, ".coverage")
Greg Ward
run-tests: move bits of main program so it's all at the bottom.
r8093
Gregory Szorc
run-tests: move TESTDIR out of a global...
r21341 vlog("# Using TESTDIR", runner.testdir)
Gregory Szorc
run-tests: move HGTMP out of a global
r21342 vlog("# Using HGTMP", runner.hgtmp)
Greg Ward
run-tests: redefine --with-hg so it takes the 'hg' script to run....
r8674 vlog("# Using PATH", os.environ["PATH"])
Ronny Pfannschmidt
tests: adapt the test runner to work with jython
r10758 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
Greg Ward
run-tests: factor out main(); reduce use of globals a bit.
r8094 try:
Gregory Szorc
run-tests: add options to runner
r21349 return runtests(runner, tests) or 0
Greg Ward
run-tests: factor out main(); reduce use of globals a bit.
r8094 finally:
Matt Mackall
tests: shorten post-test sleeps...
r16346 time.sleep(.1)
Gregory Szorc
run-tests: move cleanup() into TestRunner
r21350 runner.cleanup()
Bryan O'Sullivan
Allow tests to run in parallel.
r5384
Simon Heimberg
run-tests: loadable as module
r13347 if __name__ == '__main__':
Gregory Szorc
run-tests: use return values instead of sys.exit
r21007 sys.exit(main(sys.argv[1:]))