mercurial-scm/hg-stable: tests/run-tests.py annotate

annotate tests/run-tests.py @ 21022:52e9e63f1495

run-tests: test result shows when a failed test could not start a server Failing to start a server happens regularly, at least on windows buildbot. Such a failure often has nothing to do with the test, but with the environment. But half the test output can change because some data is missing. Therefore this is worth an extended error message. Detect the server failure in the diff output because it is most reliable there. Checking the output only does not show if the server failure was expected. Old failure message when server start failed: Failed test-serve.t: output changed New message: Failed test-serve.t: serve failed and output changed

author	Simon Heimberg <simohe@besonet.ch>
date	Mon, 25 Nov 2013 22:00:46 +0100
parents	990f5392c018
children	57b50abe2b24

rev	line source
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	1 #!/usr/bin/env python
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	2 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	3 # run-tests.py - Run a set of tests on Mercurial
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	4 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	5 # Copyright 2006 Matt Mackall <mpm@selenic.com>
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	6 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8161 diff changeset	7 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10154 diff changeset	8 # GNU General Public License version 2 or any later version.
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	9
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	10 # Modifying this script is tricky because it has many modes:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	11 # - serial (default) vs parallel (-jN, N > 1)
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	12 # - no coverage (default) vs coverage (-c, -C, -s)
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	13 # - temp install (default) vs specific hg script (--with-hg, --local)
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	14 # - tests are a mix of shell scripts and Python scripts
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	15 #
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	16 # If you change this script, it is recommended that you ensure you
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	17 # haven't broken it by running it in various modes with a representative
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	18 # sample of test scripts. For example:
8843 eb7b247a98ea kill trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8724 diff changeset	19 #
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	20 # 1) serial, no coverage, temp install:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	21 # ./run-tests.py test-s*
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	22 # 2) serial, no coverage, local hg:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	23 # ./run-tests.py --local test-s*
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	24 # 3) serial, coverage, temp install:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	25 # ./run-tests.py -c test-s*
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	26 # 4) serial, coverage, local hg:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	27 # ./run-tests.py -c --local test-s* # unsupported
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	28 # 5) parallel, no coverage, temp install:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	29 # ./run-tests.py -j2 test-s*
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	30 # 6) parallel, no coverage, local hg:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	31 # ./run-tests.py -j2 --local test-s*
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	32 # 7) parallel, coverage, temp install:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	33 # ./run-tests.py -j2 -c test-s* # currently broken
9899 be574a37a8ae run-tests: give each child its own tmp dir (issue1911) Greg Ward <greg@gerg.ca> parents: 9707 diff changeset	34 # 8) parallel, coverage, local install:
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	35 # ./run-tests.py -j2 -c --local test-s* # unsupported (and broken)
9899 be574a37a8ae run-tests: give each child its own tmp dir (issue1911) Greg Ward <greg@gerg.ca> parents: 9707 diff changeset	36 # 9) parallel, custom tmp dir:
be574a37a8ae run-tests: give each child its own tmp dir (issue1911) Greg Ward <greg@gerg.ca> parents: 9707 diff changeset	37 # ./run-tests.py -j2 --tmpdir /tmp/myhgtests
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	38 #
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	39 # (You could use any subset of the tests: test-s* happens to match
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	40 # enough that it's worth doing parallel runs, few enough that it
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	41 # completes fairly quickly, includes both shell and Python scripts, and
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	42 # includes some scripts that run daemon processes.)
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	43
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	44 from distutils import version
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	45 import difflib
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	46 import errno
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	47 import optparse
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	48 import os
10905 13a1b2fb7ef2 pylint, pyflakes: remove unused or duplicate imports Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10903 diff changeset	49 import shutil
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	50 import subprocess
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	51 import signal
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	52 import sys
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	53 import tempfile
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	54 import time
18616 35b4affe6fdd test: display used python hash seed Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18565 diff changeset	55 import random
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	56 import re
14000 636a6f5aa2cd run-tests: add locking on results struct Matt Mackall <mpm@selenic.com> parents: 13999 diff changeset	57 import threading
17464 eddfb9a550d0 run-tests: do not duplicate killdaemons() code Patrick Mezard <patrick@mezard.eu> parents: 16906 diff changeset	58 import killdaemons as killmod
18057 6b88ded2a993 run-tests: support running tests in parallel on windows Bryan O'Sullivan <bryano@fb.com> parents: 18050 diff changeset	59 import Queue as queue
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	60
14019 fbbd5f91d5e1 run-tests: do chdir for tests under a lock for thread safety Matt Mackall <mpm@selenic.com> parents: 14018 diff changeset	61 processlock = threading.Lock()
19413 a4de0d3dc35a run-tests: lock popen wait/poll Brendan Cully <brendan@kublai.com> parents: 19407 diff changeset	62
19415 a0699972e75a run-tests: replace popen locking with a noop _cleanup handler on py24 Brendan Cully <brendan@kublai.com> parents: 19414 diff changeset	63 # subprocess._cleanup can race with any Popen.wait or Popen.poll on py24
a0699972e75a run-tests: replace popen locking with a noop _cleanup handler on py24 Brendan Cully <brendan@kublai.com> parents: 19414 diff changeset	64 # http://bugs.python.org/issue1731717 for details. We shouldn't be producing
a0699972e75a run-tests: replace popen locking with a noop _cleanup handler on py24 Brendan Cully <brendan@kublai.com> parents: 19414 diff changeset	65 # zombies but it's pretty harmless even if we do.
20219 f694cd81b600 run-tests: better check for python version Simon Heimberg <simohe@besonet.ch> parents: 20046 diff changeset	66 if sys.version_info < (2, 5):
19415 a0699972e75a run-tests: replace popen locking with a noop _cleanup handler on py24 Brendan Cully <brendan@kublai.com> parents: 19414 diff changeset	67 subprocess._cleanup = lambda: None
14019 fbbd5f91d5e1 run-tests: do chdir for tests under a lock for thread safety Matt Mackall <mpm@selenic.com> parents: 14018 diff changeset	68
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	69 closefds = os.name == 'posix'
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	70 def Popen4(cmd, wd, timeout, env=None):
14019 fbbd5f91d5e1 run-tests: do chdir for tests under a lock for thread safety Matt Mackall <mpm@selenic.com> parents: 14018 diff changeset	71 processlock.acquire()
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	72 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	73 close_fds=closefds,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	74 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	75 stderr=subprocess.STDOUT)
14019 fbbd5f91d5e1 run-tests: do chdir for tests under a lock for thread safety Matt Mackall <mpm@selenic.com> parents: 14018 diff changeset	76 processlock.release()
fbbd5f91d5e1 run-tests: do chdir for tests under a lock for thread safety Matt Mackall <mpm@selenic.com> parents: 14018 diff changeset	77
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	78 p.fromchild = p.stdout
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	79 p.tochild = p.stdin
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	80 p.childerr = p.stderr
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	81
14337 439ed4721a6d run-tests: ignore timeout when Popen.terminate is unavailable Patrick Mezard <pmezard@gmail.com> parents: 14336 diff changeset	82 p.timeout = False
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	83 if timeout:
9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	84 def t():
9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	85 start = time.time()
9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	86 while time.time() - start < timeout and p.returncode is None:
16346 48692b416fbc tests: shorten post-test sleeps Matt Mackall <mpm@selenic.com> parents: 15942 diff changeset	87 time.sleep(.1)
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	88 p.timeout = True
9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	89 if p.returncode is None:
14821 2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	90 terminate(p)
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	91 threading.Thread(target=t).start()
9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	92
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	93 return p
0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8258 diff changeset	94
5685 57d29a45ffbc Use skipped: instead of hghave: for skipping tests, use this in test-merge-types Thomas Arendsen Hein <thomas@intevation.de> parents: 5524 diff changeset	95 # reserved exit code to skip test (used by hghave)
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	96 SKIPPED_STATUS = 80
5685 57d29a45ffbc Use skipped: instead of hghave: for skipping tests, use this in test-merge-types Thomas Arendsen Hein <thomas@intevation.de> parents: 5524 diff changeset	97 SKIPPED_PREFIX = 'skipped: '
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	98 FAILED_PREFIX = 'hghave check failed: '
15448 873f94ecd706 run-tests: convert windows paths to unix Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	99 PYTHON = sys.executable.replace('\\', '/')
10758 2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	100 IMPL_PATH = 'PYTHONPATH'
2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	101 if 'java' in sys.platform:
2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	102 IMPL_PATH = 'JYTHONPATH'
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	103
18049 07ad75b22910 run-tests: check for the correct python when starting Bryan O'Sullivan <bryano@fb.com> parents: 18048 diff changeset	104 requiredtools = [os.path.basename(sys.executable), "diff", "grep", "unzip",
07ad75b22910 run-tests: check for the correct python when starting Bryan O'Sullivan <bryano@fb.com> parents: 18048 diff changeset	105 "gunzip", "bunzip2", "sed"]
20019 edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	106 createdfiles = []
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	107
6366 07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	108 defaults = {
07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	109 'jobs': ('HGTEST_JOBS', 1),
07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	110 'timeout': ('HGTEST_TIMEOUT', 180),
07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	111 'port': ('HGTEST_PORT', 20059),
15941 af289d6cd422 tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' Mads Kiilerich <mads@kiilerich.com> parents: 15940 diff changeset	112 'shell': ('HGTEST_SHELL', 'sh'),
6366 07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	113 }
07c3cd695b48 run-tests.py: Allow environment variables to set jobs/timeout/port. Thomas Arendsen Hein <thomas@intevation.de> parents: 6343 diff changeset	114
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	115 def parselistfiles(files, listtype, warn=True):
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	116 entries = dict()
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	117 for filename in files:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	118 try:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	119 path = os.path.expanduser(os.path.expandvars(filename))
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	120 f = open(path, "r")
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	121 except IOError, err:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	122 if err.errno != errno.ENOENT:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	123 raise
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	124 if warn:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	125 print "warning: no such %s file: %s" % (listtype, filename)
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	126 continue
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	127
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	128 for line in f.readlines():
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	129 line = line.split('#', 1)[0].strip()
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	130 if line:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	131 entries[line] = filename
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	132
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	133 f.close()
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	134 return entries
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	135
21008 c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	136 def getparser():
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	137 parser = optparse.OptionParser("%prog [options] [tests]")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	138
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	139 # keep these sorted
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	140 parser.add_option("--blacklist", action="append",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	141 help="skip tests listed in the specified blacklist file")
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	142 parser.add_option("--whitelist", action="append",
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	143 help="always run tests listed in the specified whitelist file")
20821 3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	144 parser.add_option("--changed", type="string",
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	145 help="run tests that are changed in parent rev or working directory")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	146 parser.add_option("-C", "--annotate", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	147 help="output files annotated with coverage")
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	148 parser.add_option("-c", "--cover", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	149 help="print a test coverage report")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	150 parser.add_option("-d", "--debug", action="store_true",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	151 help="debug mode: write output of test scripts to console"
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	152 " rather than capturing and diff'ing it (disables timeout)")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	153 parser.add_option("-f", "--first", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	154 help="exit on the first test failure")
15859 44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	155 parser.add_option("-H", "--htmlcov", action="store_true",
44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	156 help="create an HTML report of the coverage of the files")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	157 parser.add_option("-i", "--interactive", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	158 help="prompt to accept changed output")
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	159 parser.add_option("-j", "--jobs", type="int",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	160 help="number of jobs to run in parallel"
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	161 " (default: $%s or %d)" % defaults['jobs'])
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	162 parser.add_option("--keep-tmpdir", action="store_true",
9706 f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	163 help="keep temporary directory after running tests")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	164 parser.add_option("-k", "--keywords",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	165 help="run tests matching keywords")
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	166 parser.add_option("-l", "--local", action="store_true",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	167 help="shortcut for --with-hg=<testdir>/../hg")
19283 8300adf9ca33 run-tests: add --loop support Matt Mackall <mpm@selenic.com> parents: 19282 diff changeset	168 parser.add_option("--loop", action="store_true",
8300adf9ca33 run-tests: add --loop support Matt Mackall <mpm@selenic.com> parents: 19282 diff changeset	169 help="loop tests repeatedly")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	170 parser.add_option("-n", "--nodiff", action="store_true",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	171 help="skip showing test changes")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	172 parser.add_option("-p", "--port", type="int",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	173 help="port on which servers should listen"
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	174 " (default: $%s or %d)" % defaults['port'])
17966 ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	175 parser.add_option("--compiler", type="string",
ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	176 help="compiler to build with")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	177 parser.add_option("--pure", action="store_true",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	178 help="use pure Python code instead of C extensions")
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	179 parser.add_option("-R", "--restart", action="store_true",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	180 help="restart at last error")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	181 parser.add_option("-r", "--retest", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	182 help="retest failed tests")
9580 25858f9e65e8 run-tests: add --noskips option Matt Mackall <mpm@selenic.com> parents: 9408 diff changeset	183 parser.add_option("-S", "--noskips", action="store_true",
25858f9e65e8 run-tests: add --noskips option Matt Mackall <mpm@selenic.com> parents: 9408 diff changeset	184 help="don't report skip tests verbosely")
14202 b68a41420397 run-tests: add --shell command line flag Martin Geisler <mg@lazybytes.net> parents: 14201 diff changeset	185 parser.add_option("--shell", type="string",
b68a41420397 run-tests: add --shell command line flag Martin Geisler <mg@lazybytes.net> parents: 14201 diff changeset	186 help="shell to use (default: $%s or %s)" % defaults['shell'])
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	187 parser.add_option("-t", "--timeout", type="int",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	188 help="kill errant tests after TIMEOUT seconds"
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	189 " (default: $%s or %d)" % defaults['timeout'])
17921 4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	190 parser.add_option("--time", action="store_true",
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	191 help="time how long each test takes")
11039 cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	192 parser.add_option("--tmpdir", type="string",
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	193 help="run tests in the given temporary directory"
cf0a309f6c4d run-tests: sort options Matt Mackall <mpm@selenic.com> parents: 11038 diff changeset	194 " (implies --keep-tmpdir)")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	195 parser.add_option("-v", "--verbose", action="store_true",
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	196 help="output verbose messages")
11040 8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	197 parser.add_option("--view", type="string",
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	198 help="external diff viewer")
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	199 parser.add_option("--with-hg", type="string",
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	200 metavar="HG",
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	201 help="test using specified hg script rather than a "
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	202 "temporary installation")
9028 bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	203 parser.add_option("-3", "--py3k-warnings", action="store_true",
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	204 help="enable Py3k warnings on Python 2.6+")
14134 8468ec1109d1 run-tests: add flag to provide extra hgrc options for test runs Augie Fackler <durin42@gmail.com> parents: 14062 diff changeset	205 parser.add_option('--extra-config-opt', action="append",
8468ec1109d1 run-tests: add flag to provide extra hgrc options for test runs Augie Fackler <durin42@gmail.com> parents: 14062 diff changeset	206 help='set the given config opt in the test hgrc')
19057 3d265e0822d3 run-tests: introduce --random for running tests in random error Mads Kiilerich <madski@unity3d.com> parents: 18788 diff changeset	207 parser.add_option('--random', action="store_true",
3d265e0822d3 run-tests: introduce --random for running tests in random error Mads Kiilerich <madski@unity3d.com> parents: 18788 diff changeset	208 help='run tests in random order')
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	209
14201 57e04ded3da4 run-tests: use type of default to convert environment variable Martin Geisler <mg@lazybytes.net> parents: 14192 diff changeset	210 for option, (envvar, default) in defaults.items():
57e04ded3da4 run-tests: use type of default to convert environment variable Martin Geisler <mg@lazybytes.net> parents: 14192 diff changeset	211 defaults[option] = type(default)(os.environ.get(envvar, default))
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	212 parser.set_defaults(**defaults)
21008 c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	213
c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	214 return parser
c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	215
c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	216 def parseargs(args, parser):
21006 723e41ad59b4 run-tests: Pass arguments into argument parser Gregory Szorc <gregory.szorc@gmail.com> parents: 20821 diff changeset	217 (options, args) = parser.parse_args(args)
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	218
10758 2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	219 # jython is always pure
10766 afbcea270bb8 run-tests: force to test pure on pypy as well Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10765 diff changeset	220 if 'java' in sys.platform or '__pypy__' in sys.modules:
10765 fd31a3237498 Fix run-tests.py -jX after 2ed667a9dfcb Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10758 diff changeset	221 options.pure = True
10758 2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	222
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	223 if options.with_hg:
15942 d7a34c07e69b run-tests: expand user in --with-hg Mads Kiilerich <mads@kiilerich.com> parents: 15941 diff changeset	224 options.with_hg = os.path.expanduser(options.with_hg)
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	225 if not (os.path.isfile(options.with_hg) and
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	226 os.access(options.with_hg, os.X_OK)):
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	227 parser.error('--with-hg must specify an executable hg script')
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	228 if not os.path.basename(options.with_hg) == 'hg':
14359 ad5c68a0db6a run-tests: print a newline after all warnings Thomas Arendsen Hein <thomas@intevation.de> parents: 14340 diff changeset	229 sys.stderr.write('warning: --with-hg should specify an hg script\n')
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	230 if options.local:
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	231 testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	232 hgbin = os.path.join(os.path.dirname(testdir), 'hg')
16538 dd194e5df4c1 tests: don't require 'hg' without extension on windows Mads Kiilerich <mads@kiilerich.com> parents: 16346 diff changeset	233 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	234 parser.error('--local specified, but %r not found or not executable'
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	235 % hgbin)
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	236 options.with_hg = hgbin
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	237
15859 44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	238 options.anycoverage = options.cover or options.annotate or options.htmlcov
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	239 if options.anycoverage:
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	240 try:
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	241 import coverage
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	242 covver = version.StrictVersion(coverage.__version__).version
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	243 if covver < (3, 3):
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	244 parser.error('coverage options require coverage 3.3 or later')
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	245 except ImportError:
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	246 parser.error('coverage options now require the coverage package')
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	247
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	248 if options.anycoverage and options.local:
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	249 # this needs some path mangling somewhere, I guess
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	250 parser.error("sorry, coverage options do not work when --local "
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	251 "is specified")
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	252
19250 5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	253 global verbose
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	254 if options.verbose:
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	255 verbose = ''
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	256
9394 31203db1b2ac run-tests: expand --tmpdir and create it if needed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9031 diff changeset	257 if options.tmpdir:
31203db1b2ac run-tests: expand --tmpdir and create it if needed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9031 diff changeset	258 options.tmpdir = os.path.expanduser(options.tmpdir)
31203db1b2ac run-tests: expand --tmpdir and create it if needed Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9031 diff changeset	259
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	260 if options.jobs < 1:
9408 70bf7f853adc run-tests: standardize on --foo instead of -f/--foo Martin Geisler <mg@lazybytes.net> parents: 9407 diff changeset	261 parser.error('--jobs must be positive')
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	262 if options.interactive and options.debug:
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	263 parser.error("-i/--interactive and -d/--debug are incompatible")
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	264 if options.debug:
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	265 if options.timeout != defaults['timeout']:
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	266 sys.stderr.write(
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	267 'warning: --timeout option ignored with --debug\n')
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	268 options.timeout = 0
9028 bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	269 if options.py3k_warnings:
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	270 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
9408 70bf7f853adc run-tests: standardize on --foo instead of -f/--foo Martin Geisler <mg@lazybytes.net> parents: 9407 diff changeset	271 parser.error('--py3k-warnings can only be used on Python 2.6+')
9959 b37b060d84c7 run-tests: add a "--blacklist target" option to skip predefined test lists Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9958 diff changeset	272 if options.blacklist:
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	273 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	274 if options.whitelist:
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	275 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	276 else:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	277 options.whitelisted = {}
8091 e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	278
e85cc856d2e1 run-tests: factor out parse_args(). Clarify use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8060 diff changeset	279 return (options, args)
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	280
5800 2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	281 def rename(src, dst):
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	282 """Like os.rename(), trade atomicity and opened files friendliness
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	283 for existing destination support.
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	284 """
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	285 shutil.copy(src, dst)
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	286 os.remove(src)
2f597243e1d7 Make run-tests.py --interactive work on Windows Patrick Mezard <pmezard@gmail.com> parents: 5524 diff changeset	287
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	288 def parsehghaveoutput(lines):
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	289 '''Parse hghave log lines.
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	290 Return tuple of lists (missing, failed):
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	291 * the missing/unknown features
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	292 * the features for which existence check failed'''
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	293 missing = []
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	294 failed = []
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	295 for line in lines:
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	296 if line.startswith(SKIPPED_PREFIX):
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	297 line = line.splitlines()[0]
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	298 missing.append(line[len(SKIPPED_PREFIX):])
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	299 elif line.startswith(FAILED_PREFIX):
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	300 line = line.splitlines()[0]
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	301 failed.append(line[len(FAILED_PREFIX):])
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	302
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	303 return missing, failed
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	304
10088 ec8304e66ea5 run-tests.py: Show paths to failing tests, .err and .out Mads Kiilerich <mads@kiilerich.com> parents: 10030 diff changeset	305 def showdiff(expected, output, ref, err):
14062 643381286e0c run-tests: print a new line before writing the diff Idan Kamara <idankk86@gmail.com> parents: 14037 diff changeset	306 print
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	307 servefail = False
10088 ec8304e66ea5 run-tests.py: Show paths to failing tests, .err and .out Mads Kiilerich <mads@kiilerich.com> parents: 10030 diff changeset	308 for line in difflib.unified_diff(expected, output, ref, err):
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	309 sys.stdout.write(line)
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	310 if not servefail and line.startswith(
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	311 '+ abort: child process failed to start'):
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	312 servefail = True
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	313 return {'servefail': servefail}
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	314
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	315
19250 5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	316 verbose = False
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	317 def vlog(*msg):
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	318 if verbose is not False:
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	319 iolock.acquire()
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	320 if verbose:
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	321 print verbose,
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	322 for m in msg:
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	323 print m,
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	324 print
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	325 sys.stdout.flush()
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	326 iolock.release()
5fa946330970 run-tests: make vlog a proper function Matt Mackall <mpm@selenic.com> parents: 19249 diff changeset	327
19251 6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	328 def log(*msg):
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	329 iolock.acquire()
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	330 if verbose:
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	331 print verbose,
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	332 for m in msg:
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	333 print m,
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	334 print
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	335 sys.stdout.flush()
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	336 iolock.release()
6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	337
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	338 def findprogram(program):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	339 """Search PATH for a executable program"""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	340 for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	341 name = os.path.join(p, program)
14335 220f31030e7f run-tests: fix python executable detection and copy on Windows Patrick Mezard <pmezard@gmail.com> parents: 14282 diff changeset	342 if os.name == 'nt' or os.access(name, os.X_OK):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	343 return name
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	344 return None
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	345
19242 d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	346 def createhgrc(path, options):
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	347 # create a fresh hgrc
19299 cdc612db2ffb run-tests: open hgrc file only for writing Simon Heimberg <simohe@besonet.ch> parents: 19294 diff changeset	348 hgrc = open(path, 'w')
19242 d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	349 hgrc.write('[ui]\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	350 hgrc.write('slash = True\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	351 hgrc.write('interactive = False\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	352 hgrc.write('[defaults]\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	353 hgrc.write('backout = -d "0 0"\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	354 hgrc.write('commit = -d "0 0"\n')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: 19759 diff changeset	355 hgrc.write('shelve = --date "0 0"\n')
19242 d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	356 hgrc.write('tag = -d "0 0"\n')
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	357 if options.extra_config_opt:
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	358 for opt in options.extra_config_opt:
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	359 section, key = opt.split('.', 1)
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	360 assert '=' in key, ('extra config opt %s must '
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	361 'have an = for assignment' % opt)
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	362 hgrc.write('[%s]\n%s\n' % (section, key))
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	363 hgrc.close()
d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	364
19275 de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	365 def createenv(options, testtmp, threadtmp, port):
19269 f4247d7e2046 run-tests: move environment creation to a separate function Matt Mackall <mpm@selenic.com> parents: 19268 diff changeset	366 env = os.environ.copy()
f4247d7e2046 run-tests: move environment creation to a separate function Matt Mackall <mpm@selenic.com> parents: 19268 diff changeset	367 env['TESTTMP'] = testtmp
f4247d7e2046 run-tests: move environment creation to a separate function Matt Mackall <mpm@selenic.com> parents: 19268 diff changeset	368 env['HOME'] = testtmp
19275 de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	369 env["HGPORT"] = str(port)
de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	370 env["HGPORT1"] = str(port + 1)
de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	371 env["HGPORT2"] = str(port + 2)
19274 6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	372 env["HGRCPATH"] = os.path.join(threadtmp, '.hgrc')
6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	373 env["DAEMON_PIDS"] = os.path.join(threadtmp, 'daemon.pids')
19272 16df87e25f41 run-tests: move more variables to env Matt Mackall <mpm@selenic.com> parents: 19271 diff changeset	374 env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
16df87e25f41 run-tests: move more variables to env Matt Mackall <mpm@selenic.com> parents: 19271 diff changeset	375 env["HGMERGE"] = "internal:merge"
16df87e25f41 run-tests: move more variables to env Matt Mackall <mpm@selenic.com> parents: 19271 diff changeset	376 env["HGUSER"] = "test"
16df87e25f41 run-tests: move more variables to env Matt Mackall <mpm@selenic.com> parents: 19271 diff changeset	377 env["HGENCODING"] = "ascii"
16df87e25f41 run-tests: move more variables to env Matt Mackall <mpm@selenic.com> parents: 19271 diff changeset	378 env["HGENCODINGMODE"] = "strict"
19269 f4247d7e2046 run-tests: move environment creation to a separate function Matt Mackall <mpm@selenic.com> parents: 19268 diff changeset	379
19270 ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	380 # Reset some environment variables to well-known values so that
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	381 # the tests produce repeatable output.
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	382 env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	383 env['TZ'] = 'GMT'
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	384 env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	385 env['COLUMNS'] = '80'
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	386 env['TERM'] = 'xterm'
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	387
19271 08be9601b464 run-tests: simplify env deletion Matt Mackall <mpm@selenic.com> parents: 19270 diff changeset	388 for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
08be9601b464 run-tests: simplify env deletion Matt Mackall <mpm@selenic.com> parents: 19270 diff changeset	389 'NO_PROXY').split():
08be9601b464 run-tests: simplify env deletion Matt Mackall <mpm@selenic.com> parents: 19270 diff changeset	390 if k in env:
08be9601b464 run-tests: simplify env deletion Matt Mackall <mpm@selenic.com> parents: 19270 diff changeset	391 del env[k]
19270 ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	392
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	393 # unset env related to hooks
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	394 for k in env.keys():
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	395 if k.startswith('HG_'):
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	396 del env[k]
ac80a1cddf83 run-tests: move most of remaining environment tweaks Matt Mackall <mpm@selenic.com> parents: 19269 diff changeset	397
19269 f4247d7e2046 run-tests: move environment creation to a separate function Matt Mackall <mpm@selenic.com> parents: 19268 diff changeset	398 return env
19242 d25fc3264d44 run-tests: pull hgrc creation out as function Matt Mackall <mpm@selenic.com> parents: 19241 diff changeset	399
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	400 def checktools():
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	401 # Before we go any further, check for pre-requisite tools
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	402 # stuff from coreutils (cat, rm, etc) are not tested
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	403 for p in requiredtools:
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	404 if os.name == 'nt' and not p.endswith('.exe'):
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	405 p += '.exe'
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	406 found = findprogram(p)
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	407 if found:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	408 vlog("# Found prerequisite", p, "at", found)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	409 else:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	410 print "WARNING: Did not find prerequisite tool: "+p
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	411
14821 2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	412 def terminate(proc):
2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	413 """Terminate subprocess (with fallback for Python versions < 2.6)"""
2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	414 vlog('# Terminating process %d' % proc.pid)
2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	415 try:
14971 0b21ae0a2366 tests: use getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14867 diff changeset	416 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
14821 2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	417 except OSError:
2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	418 pass
2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	419
19263 062c0a0a5549 run-tests: use env dict to kill daemons Matt Mackall <mpm@selenic.com> parents: 19262 diff changeset	420 def killdaemons(pidfile):
062c0a0a5549 run-tests: use env dict to kill daemons Matt Mackall <mpm@selenic.com> parents: 19262 diff changeset	421 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
17464 eddfb9a550d0 run-tests: do not duplicate killdaemons() code Patrick Mezard <patrick@mezard.eu> parents: 16906 diff changeset	422 logfn=vlog)
10336 bc9a3bb267fa run-tests: kill daemons on ^C with -j. Brendan Cully <brendan@kublai.com> parents: 10300 diff changeset	423
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	424 def cleanup(options):
6208 c88b9e597588 tests: add --keep-tmp to run-tests.py to debug test environment Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6004 diff changeset	425 if not options.keep_tmpdir:
8671 a434c94b48e7 run-tests: show PID if running in parallel mode with -v. Greg Ward <greg-hg@gerg.ca> parents: 8651 diff changeset	426 vlog("# Cleaning up HGTMP", HGTMP)
6208 c88b9e597588 tests: add --keep-tmp to run-tests.py to debug test environment Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6004 diff changeset	427 shutil.rmtree(HGTMP, True)
20019 edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	428 for f in createdfiles:
edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	429 try:
edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	430 os.remove(f)
edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	431 except OSError:
edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	432 pass
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	433
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	434 def usecorrectpython():
2570 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	435 # some tests run python interpreter. they must use same
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	436 # interpreter we use or bad things will happen.
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	437 pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	438 if getattr(os, 'symlink', None):
18061 0e4316c3a703 run-tests: fix whitespace nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 18060 diff changeset	439 vlog("# Making python executable in test path a symlink to '%s'" %
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	440 sys.executable)
20541 44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	441 mypython = os.path.join(TMPBINDIR, pyexename)
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	442 try:
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	443 if os.readlink(mypython) == sys.executable:
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	444 return
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	445 os.unlink(mypython)
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	446 except OSError, err:
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	447 if err.errno != errno.ENOENT:
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	448 raise
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	449 if findprogram(pyexename) != sys.executable:
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	450 try:
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	451 os.symlink(sys.executable, mypython)
20019 edbf7f1fd2a2 run-tests: remove files that we potentially create outside of $TMPDIR Sean Farley <sean.michael.farley@gmail.com> parents: 20018 diff changeset	452 createdfiles.append(mypython)
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	453 except OSError, err:
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	454 # child processes may race, which is harmless
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	455 if err.errno != errno.EEXIST:
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	456 raise
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	457 else:
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	458 exedir, exename = os.path.split(sys.executable)
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	459 vlog("# Modifying search path to find %s as %s in '%s'" %
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	460 (exename, pyexename, exedir))
18059 c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	461 path = os.environ['PATH'].split(os.pathsep)
c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	462 while exedir in path:
c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	463 path.remove(exedir)
c135ab6413b4 run-tests: on windows, put correct python at front of PATH Bryan O'Sullivan <bryano@fb.com> parents: 18058 diff changeset	464 os.environ['PATH'] = os.pathsep.join([exedir] + path)
18244 5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	465 if not findprogram(pyexename):
5a3c71b0e042 run-tests.py: fix handling of symlink to the right python Mads Kiilerich <mads@kiilerich.com> parents: 18230 diff changeset	466 print "WARNING: Cannot find %s in search path" % pyexename
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2989 diff changeset	467
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	468 def installhg(options):
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	469 vlog("# Performing temporary installation of HG")
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	470 installerrs = os.path.join("tests", "install.err")
17966 ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	471 compiler = ''
ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	472 if options.compiler:
ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	473 compiler = '--compiler ' + options.compiler
7723 a343cd25e425 run-tests: add --pure flag for using pure Python modules Martin Geisler <mg@daimi.au.dk> parents: 7529 diff changeset	474 pure = options.pure and "--pure" or ""
19758 14c4f605f0fc run-tests: if run by python3, execute setup.py with --c2to3 Augie Fackler <raf@durin42.com> parents: 19527 diff changeset	475 py3 = ''
14c4f605f0fc run-tests: if run by python3, execute setup.py with --c2to3 Augie Fackler <raf@durin42.com> parents: 19527 diff changeset	476 if sys.version_info[0] == 3:
14c4f605f0fc run-tests: if run by python3, execute setup.py with --c2to3 Augie Fackler <raf@durin42.com> parents: 19527 diff changeset	477 py3 = '--c2to3'
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	478
5267 b817d17c7ee5 Make run-tests.py work when invoked outside of tests. Brendan Cully <brendan@kublai.com> parents: 5251 diff changeset	479 # Run installer in hg root
8943 09ff905cdc86 run-tests: use os.path.realpath() to find hg's setup.py. Greg Ward <greg-hg@gerg.ca> parents: 8843 diff changeset	480 script = os.path.realpath(sys.argv[0])
09ff905cdc86 run-tests: use os.path.realpath() to find hg's setup.py. Greg Ward <greg-hg@gerg.ca> parents: 8843 diff changeset	481 hgroot = os.path.dirname(os.path.dirname(script))
09ff905cdc86 run-tests: use os.path.realpath() to find hg's setup.py. Greg Ward <greg-hg@gerg.ca> parents: 8843 diff changeset	482 os.chdir(hgroot)
9905 95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	483 nohome = '--home=""'
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	484 if os.name == 'nt':
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	485 # The --home="" trick works only on OS where os.sep == '/'
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	486 # because of a distutils convert_path() fast-path. Avoid it at
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	487 # least on Windows for now, deal with .pydistutils.cfg bugs
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	488 # when they happen.
95517eb3c9a7 run-tests: work around a distutils bug triggered by 0a8a43b4ca75 Patrick Mezard <pmezard@gmail.com> parents: 9902 diff changeset	489 nohome = ''
19758 14c4f605f0fc run-tests: if run by python3, execute setup.py with --c2to3 Augie Fackler <raf@durin42.com> parents: 19527 diff changeset	490 cmd = ('%(exe)s setup.py %(py3)s %(pure)s clean --all'
17966 ae20cde050c2 run-tests: add a --compiler option Bryan O'Sullivan <bryano@fb.com> parents: 17965 diff changeset	491 ' build %(compiler)s --build-base="%(base)s"'
17965 0167da3cbc44 run-tests: make build command line less intimidating Bryan O'Sullivan <bryano@fb.com> parents: 17936 diff changeset	492 ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
0167da3cbc44 run-tests: make build command line less intimidating Bryan O'Sullivan <bryano@fb.com> parents: 17936 diff changeset	493 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
20680 d3d3e94e2910 run-tests: move from dict() construction to {} literals Augie Fackler <raf@durin42.com> parents: 20622 diff changeset	494 % {'exe': sys.executable, 'py3': py3, 'pure': pure,
d3d3e94e2910 run-tests: move from dict() construction to {} literals Augie Fackler <raf@durin42.com> parents: 20622 diff changeset	495 'compiler': compiler, 'base': os.path.join(HGTMP, "build"),
d3d3e94e2910 run-tests: move from dict() construction to {} literals Augie Fackler <raf@durin42.com> parents: 20622 diff changeset	496 'prefix': INST, 'libdir': PYTHONDIR, 'bindir': BINDIR,
d3d3e94e2910 run-tests: move from dict() construction to {} literals Augie Fackler <raf@durin42.com> parents: 20622 diff changeset	497 'nohome': nohome, 'logfile': installerrs})
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	498 vlog("# Running", cmd)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	499 if os.system(cmd) == 0:
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	500 if not options.verbose:
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	501 os.remove(installerrs)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	502 else:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	503 f = open(installerrs)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	504 for line in f:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	505 print line,
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	506 f.close()
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	507 sys.exit(1)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	508 os.chdir(TESTDIR)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	509
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	510 usecorrectpython()
2570 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	511
9028 bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	512 if options.py3k_warnings and not options.anycoverage:
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	513 vlog("# Updating hg command to enable Py3k Warnings switch")
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	514 f = open(os.path.join(BINDIR, 'hg'), 'r')
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	515 lines = [line.rstrip() for line in f]
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	516 lines[0] += ' -3'
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	517 f.close()
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	518 f = open(os.path.join(BINDIR, 'hg'), 'w')
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	519 for line in lines:
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	520 f.write(line + '\n')
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	521 f.close()
bea567ae3ff6 tests: add -3 switch to run-tests.py Alejandro Santos <alejolp@alejolp.com> parents: 8943 diff changeset	522
14336 0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	523 hgbat = os.path.join(BINDIR, 'hg.bat')
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	524 if os.path.isfile(hgbat):
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	525 # hg.bat expects to be put in bin/scripts while run-tests.py
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	526 # installation layout put it in bin/ directly. Fix it
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	527 f = open(hgbat, 'rb')
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	528 data = f.read()
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	529 f.close()
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	530 if '"%~dp0..\python" "%~dp0hg" %*' in data:
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	531 data = data.replace('"%~dp0..\python" "%~dp0hg" %*',
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	532 '"%~dp0python" "%~dp0hg" %*')
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	533 f = open(hgbat, 'wb')
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	534 f.write(data)
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	535 f.close()
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	536 else:
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	537 print 'WARNING: cannot fix hg.bat reference to python.exe'
0cbf0d1f7939 run-tests: fix hg.bat python reference Patrick Mezard <pmezard@gmail.com> parents: 14335 diff changeset	538
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	539 if options.anycoverage:
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	540 custom = os.path.join(TESTDIR, 'sitecustomize.py')
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	541 target = os.path.join(PYTHONDIR, 'sitecustomize.py')
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	542 vlog('# Installing coverage trigger to %s' % target)
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	543 shutil.copyfile(custom, target)
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	544 rc = os.path.join(TESTDIR, '.coveragerc')
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	545 vlog('# Installing coverage rc to %s' % rc)
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	546 os.environ['COVERAGE_PROCESS_START'] = rc
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	547 fn = os.path.join(INST, '..', '.coverage')
58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	548 os.environ['COVERAGE_FILE'] = fn
8092 c49578c5122f run-tests: move _hgpath() up so it's not in the middle of the main program. Greg Ward <greg-hg@gerg.ca> parents: 8091 diff changeset	549
17921 4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	550 def outputtimes(options):
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	551 vlog('# Producing time report')
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	552 times.sort(key=lambda t: (t[1], t[0]), reverse=True)
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	553 cols = '%7.3f %s'
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	554 print '\n%-7s %s' % ('Time', 'Test')
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	555 for test, timetaken in times:
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	556 print cols % (timetaken, test)
4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	557
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	558 def outputcoverage(options):
8620 b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	559
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	560 vlog('# Producing coverage report')
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	561 os.chdir(PYTHONDIR)
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	562
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	563 def covrun(*args):
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	564 cmd = 'coverage %s' % ' '.join(args)
8620 b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	565 vlog('# Running: %s' % cmd)
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	566 os.system(cmd)
b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	567
10648 58128004cca1 tests: use external coverage, mandate newer version Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10413 diff changeset	568 covrun('-c')
15858 14132a55d66b run-tests: use a list comprehension instead of map Matt Mackall <mpm@selenic.com> parents: 15857 diff changeset	569 omit = ','.join(os.path.join(x, '*') for x in [BINDIR, TESTDIR])
8620 b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	570 covrun('-i', '-r', '"--omit=%s"' % omit) # report
15859 44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	571 if options.htmlcov:
44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	572 htmldir = os.path.join(TESTDIR, 'htmlcov')
44a371823f83 tests: add htmlcov option Markus Zapke-Gr?ndemann <info@keimlink.de> parents: 15858 diff changeset	573 covrun('-i', '-b', '"--directory=%s"' % htmldir, '"--omit=%s"' % omit)
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	574 if options.annotate:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	575 adir = os.path.join(TESTDIR, 'annotated')
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	576 if not os.path.isdir(adir):
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	577 os.mkdir(adir)
8620 b38f275bb5c2 tests: make coverage run in parallel mode, clean up coverage code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8592 diff changeset	578 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	579
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	580 def pytest(test, wd, options, replacements, env):
11740 e5c79e31feb6 tests: move script execution in runner helpers Matt Mackall <mpm@selenic.com> parents: 11040 diff changeset	581 py3kswitch = options.py3k_warnings and ' -3' or ''
e5c79e31feb6 tests: move script execution in runner helpers Matt Mackall <mpm@selenic.com> parents: 11040 diff changeset	582 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
e5c79e31feb6 tests: move script execution in runner helpers Matt Mackall <mpm@selenic.com> parents: 11040 diff changeset	583 vlog("# Running", cmd)
19460 d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	584 if os.name == 'nt':
d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	585 replacements.append((r'\r\n', '\n'))
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	586 return run(cmd, wd, options, replacements, env)
11740 e5c79e31feb6 tests: move script execution in runner helpers Matt Mackall <mpm@selenic.com> parents: 11040 diff changeset	587
12941 b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	588 needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	589 escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	590 escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	591 escapemap.update({'\\': '\\\\', '\r': r'\r'})
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	592 def escapef(m):
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	593 return escapemap[m.group(0)]
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	594 def stringescape(s):
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	595 return escapesub(escapef, s)
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	596
15414 2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	597 def rematch(el, l):
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	598 try:
17777 af7c6bc48d8d run-tests: alternative way of handling \r on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17751 diff changeset	599 # use \Z to ensure that the regex matches to the end of the string
19460 d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	600 if os.name == 'nt':
d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	601 return re.match(el + r'\r?\n\Z', l)
17777 af7c6bc48d8d run-tests: alternative way of handling \r on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17751 diff changeset	602 return re.match(el + r'\n\Z', l)
15414 2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	603 except re.error:
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	604 # el is an invalid regex
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	605 return False
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	606
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	607 def globmatch(el, l):
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15435 diff changeset	608 # The only supported special characters are * and ? plus / which also
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15435 diff changeset	609 # matches \ on windows. Escaping of these caracters is supported.
18680 15711d9d8b2c tests: quickly check if the glob line already matches the output Simon Heimberg <simohe@besonet.ch> parents: 18616 diff changeset	610 if el + '\n' == l:
19419 e823abe577a2 run-tests: test for os.altsep instead of os.name when checking \ for / Simon Heimberg <simohe@besonet.ch> parents: 19415 diff changeset	611 if os.altsep:
18681 7591ed29e824 tests: inform on Windows about unnecessary glob lines Simon Heimberg <simohe@besonet.ch> parents: 18680 diff changeset	612 # matching on "/" is not needed for this line
20274 7a259dfe24f7 run-tests: print more information on unnecessary glob matching Simon Heimberg <simohe@besonet.ch> parents: 20273 diff changeset	613 return '-glob'
18680 15711d9d8b2c tests: quickly check if the glob line already matches the output Simon Heimberg <simohe@besonet.ch> parents: 18616 diff changeset	614 return True
15414 2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	615 i, n = 0, len(el)
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	616 res = ''
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	617 while i < n:
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	618 c = el[i]
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	619 i += 1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15435 diff changeset	620 if c == '\\' and el[i] in '*?\\/':
15414 2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	621 res += el[i - 1:i + 1]
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	622 i += 1
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	623 elif c == '*':
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	624 res += '.*'
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	625 elif c == '?':
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	626 res += '.'
19419 e823abe577a2 run-tests: test for os.altsep instead of os.name when checking \ for / Simon Heimberg <simohe@besonet.ch> parents: 19415 diff changeset	627 elif c == '/' and os.altsep:
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15435 diff changeset	628 res += '[/\\\\]'
15414 2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	629 else:
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	630 res += re.escape(c)
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	631 return rematch(res, l)
2a62d7c8aee7 run-tests: pull out unified matching funcs Matt Mackall <mpm@selenic.com> parents: 15413 diff changeset	632
15415 8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	633 def linematch(el, l):
8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	634 if el == l: # perfect match (fast)
8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	635 return True
17778 80fe64581f3a run-tests: make it possible to combine (esc) with (glob) and (re) Mads Kiilerich <mads@kiilerich.com> parents: 17777 diff changeset	636 if el:
80fe64581f3a run-tests: make it possible to combine (esc) with (glob) and (re) Mads Kiilerich <mads@kiilerich.com> parents: 17777 diff changeset	637 if el.endswith(" (esc)\n"):
80fe64581f3a run-tests: make it possible to combine (esc) with (glob) and (re) Mads Kiilerich <mads@kiilerich.com> parents: 17777 diff changeset	638 el = el[:-7].decode('string-escape') + '\n'
19460 d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	639 if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
d876c82f25a3 run-tests: backout 4f32747879d1 line endings change Matt Mackall <mpm@selenic.com> parents: 19438 diff changeset	640 return True
20272 9e3eb009a404 run-tests: test each line matching function on its own Simon Heimberg <simohe@besonet.ch> parents: 20259 diff changeset	641 if el.endswith(" (re)\n"):
9e3eb009a404 run-tests: test each line matching function on its own Simon Heimberg <simohe@besonet.ch> parents: 20259 diff changeset	642 return rematch(el[:-6], l)
9e3eb009a404 run-tests: test each line matching function on its own Simon Heimberg <simohe@besonet.ch> parents: 20259 diff changeset	643 if el.endswith(" (glob)\n"):
9e3eb009a404 run-tests: test each line matching function on its own Simon Heimberg <simohe@besonet.ch> parents: 20259 diff changeset	644 return globmatch(el[:-8], l)
20273 d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	645 if os.altsep and l.replace('\\', '/') == el:
d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	646 return '+glob'
15415 8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	647 return False
8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	648
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	649 def tsttest(test, wd, options, replacements, env):
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	650 # We generate a shell script which outputs unique markers to line
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	651 # up script results with our source. These markers include input
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	652 # line number and the last return code
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	653 salt = "SALT" + str(time.time())
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	654 def addsalt(line, inpython):
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	655 if inpython:
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	656 script.append('%s %d 0\n' % (salt, line))
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	657 else:
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	658 script.append('echo %s %s $?\n' % (salt, line))
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	659
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	660 # After we run the shell script, we re-unify the script output
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	661 # with non-active parts of the source, with synchronization by our
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	662 # SALT line number markers. The after table contains the
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	663 # non-active components, ordered by line number
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	664 after = {}
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	665 pos = prepos = -1
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	666
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	667 # Expected shellscript output
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	668 expected = {}
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	669
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	670 # We keep track of whether or not we're in a Python block so we
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	671 # can generate the surrounding doctest magic
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	672 inpython = False
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	673
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	674 # True or False when in a true or false conditional section
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	675 skipping = None
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	676
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	677 def hghave(reqs):
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	678 # TODO: do something smarter when all other uses of hghave is gone
16897 2774576dee4d tests/run-tests: avoid C:/ in arguments Adrian Buehlmann <adrian@cadifra.com> parents: 16890 diff changeset	679 tdir = TESTDIR.replace('\\', '/')
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	680 proc = Popen4('%s -c "%s/hghave %s"' %
16906 2a95830cff77 tests: use the right directory for running hghave from run-tests.py Mads Kiilerich <mads@kiilerich.com> parents: 16905 diff changeset	681 (options.shell, tdir, ' '.join(reqs)), wd, 0)
18229 77d06793a20d tests: make hghave and run-tests exit on unknown feature requirements Mads Kiilerich <mads@kiilerich.com> parents: 18061 diff changeset	682 stdout, stderr = proc.communicate()
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	683 ret = proc.wait()
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	684 if wifexited(ret):
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	685 ret = os.WEXITSTATUS(ret)
18229 77d06793a20d tests: make hghave and run-tests exit on unknown feature requirements Mads Kiilerich <mads@kiilerich.com> parents: 18061 diff changeset	686 if ret == 2:
77d06793a20d tests: make hghave and run-tests exit on unknown feature requirements Mads Kiilerich <mads@kiilerich.com> parents: 18061 diff changeset	687 print stdout
77d06793a20d tests: make hghave and run-tests exit on unknown feature requirements Mads Kiilerich <mads@kiilerich.com> parents: 18061 diff changeset	688 sys.exit(1)
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	689 return ret == 0
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	690
15416 3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	691 f = open(test)
3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	692 t = f.readlines()
3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	693 f.close()
3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	694
3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	695 script = []
15940 4bc35496136f tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode Mads Kiilerich <mads@kiilerich.com> parents: 15859 diff changeset	696 if options.debug:
4bc35496136f tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode Mads Kiilerich <mads@kiilerich.com> parents: 15859 diff changeset	697 script.append('set -x\n')
15569 3e13ade423f0 tests: use an alias to make msys 'pwd' return paths with forward slashes Mads Kiilerich <mads@kiilerich.com> parents: 15517 diff changeset	698 if os.getenv('MSYSTEM'):
3e13ade423f0 tests: use an alias to make msys 'pwd' return paths with forward slashes Mads Kiilerich <mads@kiilerich.com> parents: 15517 diff changeset	699 script.append('alias pwd="pwd -W"\n')
18565 ba5e71770db2 run-tests: do not fail on empty tsttest file Simon Heimberg <simohe@besonet.ch> parents: 18500 diff changeset	700 n = 0
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	701 for n, l in enumerate(t):
12934 ea7ad8c3988a tests: handle .t files without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12895 diff changeset	702 if not l.endswith('\n'):
ea7ad8c3988a tests: handle .t files without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12895 diff changeset	703 l += '\n'
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	704 if l.startswith('#if'):
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	705 if skipping is not None:
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	706 after.setdefault(pos, []).append(' !!! nested #if\n')
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	707 skipping = not hghave(l.split()[1:])
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	708 after.setdefault(pos, []).append(l)
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	709 elif l.startswith('#else'):
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	710 if skipping is None:
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	711 after.setdefault(pos, []).append(' !!! missing #if\n')
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	712 skipping = not skipping
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	713 after.setdefault(pos, []).append(l)
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	714 elif l.startswith('#endif'):
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	715 if skipping is None:
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	716 after.setdefault(pos, []).append(' !!! missing #if\n')
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	717 skipping = None
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	718 after.setdefault(pos, []).append(l)
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	719 elif skipping:
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	720 after.setdefault(pos, []).append(l)
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	721 elif l.startswith(' >>> '): # python inlines
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	722 after.setdefault(pos, []).append(l)
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	723 prepos = pos
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	724 pos = n
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	725 if not inpython:
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	726 # we've just entered a Python block, add the header
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	727 inpython = True
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	728 addsalt(prepos, False) # make sure we report the exit code
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	729 script.append('%s -m heredoctest <<EOF\n' % PYTHON)
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	730 addsalt(n, True)
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	731 script.append(l[2:])
16841 f2555e891982 run-tests: don't add python lines to expected dict Adrian Buehlmann <adrian@cadifra.com> parents: 16840 diff changeset	732 elif l.startswith(' ... '): # python inlines
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	733 after.setdefault(prepos, []).append(l)
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	734 script.append(l[2:])
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	735 elif l.startswith(' $ '): # commands
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	736 if inpython:
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	737 script.append("EOF\n")
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	738 inpython = False
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	739 after.setdefault(pos, []).append(l)
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	740 prepos = pos
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	741 pos = n
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	742 addsalt(n, False)
16905 671c73d523cf tests: make .t tests stop immediately if a cd fails Mads Kiilerich <mads@kiilerich.com> parents: 16897 diff changeset	743 cmd = l[4:].split()
671c73d523cf tests: make .t tests stop immediately if a cd fails Mads Kiilerich <mads@kiilerich.com> parents: 16897 diff changeset	744 if len(cmd) == 2 and cmd[0] == 'cd':
671c73d523cf tests: make .t tests stop immediately if a cd fails Mads Kiilerich <mads@kiilerich.com> parents: 16897 diff changeset	745 l = ' $ cd %s \|\| exit 1\n' % cmd[1]
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	746 script.append(l[4:])
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	747 elif l.startswith(' > '): # continuations
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	748 after.setdefault(prepos, []).append(l)
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	749 script.append(l[4:])
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	750 elif l.startswith(' '): # results
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	751 # queue up a list of expected results
5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	752 expected.setdefault(pos, []).append(l[2:])
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	753 else:
15412 59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	754 if inpython:
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	755 script.append("EOF\n")
59fe460bb0f0 tests: rewrite inline Python support Matt Mackall <mpm@selenic.com> parents: 15344 diff changeset	756 inpython = False
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	757 # non-command/result - queue up for merged output
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	758 after.setdefault(pos, []).append(l)
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	759
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	760 if inpython:
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	761 script.append("EOF\n")
16842 a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	762 if skipping is not None:
a3ea092203a5 tests: introduce c-style conditional sections in .t tests Mads Kiilerich <mads@kiilerich.com> parents: 16841 diff changeset	763 after.setdefault(pos, []).append(' !!! missing #endif\n')
15434 5635a4017061 run-tests: replace inline python handling with more native scheme Matt Mackall <mpm@selenic.com> parents: 15416 diff changeset	764 addsalt(n + 1, False)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11781 diff changeset	765
15416 3b7c4f96885c run-tests: minor cleanups Matt Mackall <mpm@selenic.com> parents: 15415 diff changeset	766 # Write out the script and execute it
19871 6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	767 name = wd + '.sh'
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	768 f = open(name, 'w')
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	769 for l in script:
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	770 f.write(l)
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	771 f.close()
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	772
19871 6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	773 cmd = '%s "%s"' % (options.shell, name)
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	774 vlog("# Running", cmd)
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	775 exitcode, output = run(cmd, wd, options, replacements, env)
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	776 # do not merge output if skipped, return hghave message instead
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	777 # similarly, with --debug, output is None
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	778 if exitcode == SKIPPED_STATUS or output is None:
6e74632170d3 run-tests: place the .t shell script next to $TESTTMP and with a useful name Mads Kiilerich <madski@unity3d.com> parents: 19854 diff changeset	779 return exitcode, output
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	780
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	781 # Merge the script output back into a unified test
8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	782
20601 72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	783 warnonly = 1 # 1: not yet, 2: yes, 3: for sure not
72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	784 if exitcode != 0: # failure has been reported
72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	785 warnonly = 3 # set to "for sure not"
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	786 pos = -1
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	787 postout = []
17739 5b08e8b7ab00 run-tests: drop unused enumerate Mads Kiilerich <mads@kiilerich.com> parents: 17541 diff changeset	788 for l in output:
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	789 lout, lcmd = l, None
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	790 if salt in l:
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	791 lout, lcmd = l.split(salt, 1)
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	792
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	793 if lout:
17741 a51304b851c6 run-tests: use more explicit criteria for detecting no-eol Mads Kiilerich <mads@kiilerich.com> parents: 17739 diff changeset	794 if not lout.endswith('\n'):
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	795 lout += ' (no-eol)\n'
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	796
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	797 # find the expected output at the current position
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	798 el = None
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	799 if pos in expected and expected[pos]:
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	800 el = expected[pos].pop(0)
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	801
20273 d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	802 r = linematch(el, lout)
d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	803 if isinstance(r, str):
d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	804 if r == '+glob':
d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	805 lout = el[:-1] + ' (glob)\n'
20600 2e68882852ee run-tests: fixed warn detection on detecting warn only for lines Simon Heimberg <simohe@besonet.ch> parents: 20541 diff changeset	806 r = '' # warn only this line
20274 7a259dfe24f7 run-tests: print more information on unnecessary glob matching Simon Heimberg <simohe@besonet.ch> parents: 20273 diff changeset	807 elif r == '-glob':
20510 edfbcc3163a8 run-tests: unnecessary globs also count as warnings Simon Heimberg <simohe@besonet.ch> parents: 20509 diff changeset	808 lout = ''.join(el.rsplit(' (glob)', 1))
20600 2e68882852ee run-tests: fixed warn detection on detecting warn only for lines Simon Heimberg <simohe@besonet.ch> parents: 20541 diff changeset	809 r = '' # warn only this line
20274 7a259dfe24f7 run-tests: print more information on unnecessary glob matching Simon Heimberg <simohe@besonet.ch> parents: 20273 diff changeset	810 else:
7a259dfe24f7 run-tests: print more information on unnecessary glob matching Simon Heimberg <simohe@besonet.ch> parents: 20273 diff changeset	811 log('\ninfo, unknown linematch result: %r\n' % r)
7a259dfe24f7 run-tests: print more information on unnecessary glob matching Simon Heimberg <simohe@besonet.ch> parents: 20273 diff changeset	812 r = False
20273 d9d6cbbeef0d run-tests: suggest to append glob when only path sep does not match Simon Heimberg <simohe@besonet.ch> parents: 20272 diff changeset	813 if r:
15415 8c90b3df5bed run-tests: pull out line matching function Matt Mackall <mpm@selenic.com> parents: 15414 diff changeset	814 postout.append(" " + el)
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	815 else:
12941 b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	816 if needescape(lout):
b911cb80c671 tests: use (esc) markup for string-escape Mads Kiilerich <mads@kiilerich.com> parents: 12940 diff changeset	817 lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	818 postout.append(" " + lout) # let diff deal with it
20600 2e68882852ee run-tests: fixed warn detection on detecting warn only for lines Simon Heimberg <simohe@besonet.ch> parents: 20541 diff changeset	819 if r != '': # if line failed
20601 72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	820 warnonly = 3 # set to "for sure not"
72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	821 elif warnonly == 1: # is "not yet" (and line is warn only)
72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	822 warnonly = 2 # set to "yes" do warn
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	823
518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	824 if lcmd:
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11781 diff changeset	825 # add on last return code
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	826 ret = int(lcmd.split()[1])
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11781 diff changeset	827 if ret != 0:
4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11781 diff changeset	828 postout.append(" [%s]\n" % ret)
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	829 if pos in after:
15413 8e60433e070a tests: add some comments to the unified test code Matt Mackall <mpm@selenic.com> parents: 15412 diff changeset	830 # merge in non-active test bits
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	831 postout += after.pop(pos)
12940 518dd70d1a6e tests: (no-eol) markup for command output without trailing LF Mads Kiilerich <mads@kiilerich.com> parents: 12934 diff changeset	832 pos = int(lcmd.split()[0])
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	833
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	834 if pos in after:
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	835 postout += after.pop(pos)
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	836
20601 72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	837 if warnonly == 2:
72d843e8cb6d run-tests: fixed warn detection on failures with too many output Simon Heimberg <simohe@besonet.ch> parents: 20600 diff changeset	838 exitcode = False # set exitcode to warned
11741 431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	839 return exitcode, postout
431e2bf37ae7 tests: basic support for unified tests Matt Mackall <mpm@selenic.com> parents: 11740 diff changeset	840
13348 31fdb04cb5e8 run-tests: only call WIFEXITED on systems it exists Simon Heimberg <simohe@besonet.ch> parents: 13347 diff changeset	841 wifexited = getattr(os, "WIFEXITED", lambda x: False)
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	842 def run(cmd, wd, options, replacements, env):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	843 """Run command in a sub-process, capturing the output (stdout and stderr).
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	844 Return a tuple (exitcode, output). output is None in debug mode."""
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	845 # TODO: Use subprocess.Popen if we're running on Python 2.4
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	846 if options.debug:
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	847 proc = subprocess.Popen(cmd, shell=True, cwd=wd, env=env)
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	848 ret = proc.wait()
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	849 return (ret, None)
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	850
19262 7864e8f274fe run-tests: add env dict to isolate test environment Matt Mackall <mpm@selenic.com> parents: 19252 diff changeset	851 proc = Popen4(cmd, wd, options.timeout, env)
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	852 def cleanup():
14821 2017495bd552 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() Thomas Arendsen Hein <thomas@intevation.de> parents: 14598 diff changeset	853 terminate(proc)
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	854 ret = proc.wait()
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	855 if ret == 0:
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	856 ret = signal.SIGTERM << 8
19263 062c0a0a5549 run-tests: use env dict to kill daemons Matt Mackall <mpm@selenic.com> parents: 19262 diff changeset	857 killdaemons(env['DAEMON_PIDS'])
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	858 return ret
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	859
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	860 output = ''
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	861 proc.tochild.close()
10336 bc9a3bb267fa run-tests: kill daemons on ^C with -j. Brendan Cully <brendan@kublai.com> parents: 10300 diff changeset	862
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	863 try:
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	864 output = proc.fromchild.read()
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	865 except KeyboardInterrupt:
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	866 vlog('# Handling keyboard interrupt')
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	867 cleanup()
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	868 raise
10336 bc9a3bb267fa run-tests: kill daemons on ^C with -j. Brendan Cully <brendan@kublai.com> parents: 10300 diff changeset	869
19413 a4de0d3dc35a run-tests: lock popen wait/poll Brendan Cully <brendan@kublai.com> parents: 19407 diff changeset	870 ret = proc.wait()
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	871 if wifexited(ret):
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	872 ret = os.WEXITSTATUS(ret)
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	873
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	874 if proc.timeout:
862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	875 ret = 'timeout'
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	876
14338 862f8cd87546 run-tests: use the common test path on Windows and Java Patrick Mezard <pmezard@gmail.com> parents: 14337 diff changeset	877 if ret:
19263 062c0a0a5549 run-tests: use env dict to kill daemons Matt Mackall <mpm@selenic.com> parents: 19262 diff changeset	878 killdaemons(env['DAEMON_PIDS'])
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	879
19273 f3effc499288 run-tests: add abort flag Matt Mackall <mpm@selenic.com> parents: 19272 diff changeset	880 if abort:
f3effc499288 run-tests: add abort flag Matt Mackall <mpm@selenic.com> parents: 19272 diff changeset	881 raise KeyboardInterrupt()
f3effc499288 run-tests: add abort flag Matt Mackall <mpm@selenic.com> parents: 19272 diff changeset	882
12639 236058a65cb4 tests: replace test tmp directory with $TESTTMP in test output Mads Kiilerich <mads@kiilerich.com> parents: 12621 diff changeset	883 for s, r in replacements:
12895 53cfde2b3cf9 run-tests: use regex when searching for $HGPORT in test output Martin Geisler <mg@aragost.com> parents: 12721 diff changeset	884 output = re.sub(s, r, output)
17742 405b6bd015df run-tests: allow test output lines to be terminated with \r in addition to \n Mads Kiilerich <mads@kiilerich.com> parents: 17741 diff changeset	885 return ret, output.splitlines(True)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	886
19274 6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	887 def runone(options, test, count):
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	888 '''returns a result element: (code, test, msg)'''
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	889
5470 8374f3f081f2 tests: tidy up reporting of skipped tests Matt Mackall <mpm@selenic.com> parents: 5388 diff changeset	890 def skip(msg):
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	891 if options.verbose:
19251 6857f53456f2 run-tests: add a log function Matt Mackall <mpm@selenic.com> parents: 19250 diff changeset	892 log("\nSkipping %s: %s" % (testpath, msg))
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	893 return 's', test, msg
5470 8374f3f081f2 tests: tidy up reporting of skipped tests Matt Mackall <mpm@selenic.com> parents: 5388 diff changeset	894
13988 994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	895 def fail(msg, ret):
20508 91d4f82c2d3b run-tests: add possibility for test-runners to report a "warned" test result Simon Heimberg <simohe@besonet.ch> parents: 20507 diff changeset	896 warned = ret is False
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	897 if not options.nodiff:
20508 91d4f82c2d3b run-tests: add possibility for test-runners to report a "warned" test result Simon Heimberg <simohe@besonet.ch> parents: 20507 diff changeset	898 log("\n%s: %s %s" % (warned and 'Warning' or 'ERROR', test, msg))
13999 8f9478be9a94 run-tests: fix --interactive (after 994ad067ac6e) Patrick Mezard <pmezard@gmail.com> parents: 13995 diff changeset	899 if (not ret and options.interactive
8f9478be9a94 run-tests: fix --interactive (after 994ad067ac6e) Patrick Mezard <pmezard@gmail.com> parents: 13995 diff changeset	900 and os.path.exists(testpath + ".err")):
14003 ba734ff5cadd run-tests: fix some missing i/o locks Matt Mackall <mpm@selenic.com> parents: 14002 diff changeset	901 iolock.acquire()
13988 994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	902 print "Accept this change? [n] ",
994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	903 answer = sys.stdin.readline().strip()
14003 ba734ff5cadd run-tests: fix some missing i/o locks Matt Mackall <mpm@selenic.com> parents: 14002 diff changeset	904 iolock.release()
13988 994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	905 if answer.lower() in "y yes".split():
994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	906 if test.endswith(".t"):
13999 8f9478be9a94 run-tests: fix --interactive (after 994ad067ac6e) Patrick Mezard <pmezard@gmail.com> parents: 13995 diff changeset	907 rename(testpath + ".err", testpath)
13988 994ad067ac6e run-tests: move interactive handling into runone Matt Mackall <mpm@selenic.com> parents: 13918 diff changeset	908 else:
13999 8f9478be9a94 run-tests: fix --interactive (after 994ad067ac6e) Patrick Mezard <pmezard@gmail.com> parents: 13995 diff changeset	909 rename(testpath + ".err", testpath + ".out")
19249 de45df2688a9 run-tests: unify marks and result codes Matt Mackall <mpm@selenic.com> parents: 19248 diff changeset	910 return '.', test, ''
20508 91d4f82c2d3b run-tests: add possibility for test-runners to report a "warned" test result Simon Heimberg <simohe@besonet.ch> parents: 20507 diff changeset	911 return warned and '~' or '!', test, msg
13994 f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	912
f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	913 def success():
19249 de45df2688a9 run-tests: unify marks and result codes Matt Mackall <mpm@selenic.com> parents: 19248 diff changeset	914 return '.', test, ''
13994 f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	915
f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	916 def ignore(msg):
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	917 return 'i', test, msg
6244 b36774d0fce1 run-tests.py: add a summary of failed tests at the end Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6212 diff changeset	918
19244 eee43d763f9f run-tests: regroup nested functions Matt Mackall <mpm@selenic.com> parents: 19243 diff changeset	919 def describe(ret):
eee43d763f9f run-tests: regroup nested functions Matt Mackall <mpm@selenic.com> parents: 19243 diff changeset	920 if ret < 0:
eee43d763f9f run-tests: regroup nested functions Matt Mackall <mpm@selenic.com> parents: 19243 diff changeset	921 return 'killed by signal %d' % -ret
eee43d763f9f run-tests: regroup nested functions Matt Mackall <mpm@selenic.com> parents: 19243 diff changeset	922 return 'returned error code %d' % ret
eee43d763f9f run-tests: regroup nested functions Matt Mackall <mpm@selenic.com> parents: 19243 diff changeset	923
19245 dcb05a1470bd run-tests: regroup some variable initialization Matt Mackall <mpm@selenic.com> parents: 19244 diff changeset	924 testpath = os.path.join(TESTDIR, test)
dcb05a1470bd run-tests: regroup some variable initialization Matt Mackall <mpm@selenic.com> parents: 19244 diff changeset	925 err = os.path.join(TESTDIR, test + ".err")
dcb05a1470bd run-tests: regroup some variable initialization Matt Mackall <mpm@selenic.com> parents: 19244 diff changeset	926 lctest = test.lower()
dcb05a1470bd run-tests: regroup some variable initialization Matt Mackall <mpm@selenic.com> parents: 19244 diff changeset	927
19246 29ddf9d93e35 run-tests: fix a path existence check Matt Mackall <mpm@selenic.com> parents: 19245 diff changeset	928 if not os.path.exists(testpath):
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	929 return skip("doesn't exist")
13989 55ba68a4dd28 run-tests: move existence/name format check into runone Matt Mackall <mpm@selenic.com> parents: 13988 diff changeset	930
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	931 if not (options.whitelisted and test in options.whitelisted):
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	932 if options.blacklist and test in options.blacklist:
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	933 return skip("blacklisted")
13993 174d0a113757 run-tests: move blacklist and retest filtering to runone Matt Mackall <mpm@selenic.com> parents: 13992 diff changeset	934
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	935 if options.retest and not os.path.exists(test + ".err"):
19311 ad16e5c7a429 run-tests: ignoring tests works again simon@laptop-tosh parents: 19304 diff changeset	936 return ignore("not retesting")
13993 174d0a113757 run-tests: move blacklist and retest filtering to runone Matt Mackall <mpm@selenic.com> parents: 13992 diff changeset	937
14493 5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	938 if options.keywords:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	939 fp = open(test)
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	940 t = fp.read().lower() + test.lower()
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	941 fp.close()
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	942 for k in options.keywords.lower().split():
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	943 if k in t:
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	944 break
5cc7905bccc9 run-tests: allow whitelisting tests that should always run Augie Fackler <durin42@gmail.com> parents: 14454 diff changeset	945 else:
19311 ad16e5c7a429 run-tests: ignoring tests works again simon@laptop-tosh parents: 19304 diff changeset	946 return ignore("doesn't match keyword")
13991 8cfe191e2ce4 run-tests: move keyword checking into runone Matt Mackall <mpm@selenic.com> parents: 13990 diff changeset	947
21009 990f5392c018 run-tests: allow test paths in other directories Gregory Szorc <gregory.szorc@gmail.com> parents: 21008 diff changeset	948 if not os.path.basename(lctest).startswith("test-"):
19527 534cdbe87cad run-tests: only check the common criteria once per test Simon Heimberg <simohe@besonet.ch> parents: 19460 diff changeset	949 return skip("not a test file")
19239 db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	950 for ext, func, out in testtypes:
19527 534cdbe87cad run-tests: only check the common criteria once per test Simon Heimberg <simohe@besonet.ch> parents: 19460 diff changeset	951 if lctest.endswith(ext):
19239 db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	952 runner = func
db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	953 ref = os.path.join(TESTDIR, test + out)
db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	954 break
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	955 else:
17801 03554dfc7ced run-tests: remove dead code for supporting old test scripts Mads Kiilerich <mads@kiilerich.com> parents: 17800 diff changeset	956 return skip("unknown test type")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	957
19247 b43ed416bc2d run-tests: regroup some initialization checks Matt Mackall <mpm@selenic.com> parents: 19246 diff changeset	958 vlog("# Test", test)
b43ed416bc2d run-tests: regroup some initialization checks Matt Mackall <mpm@selenic.com> parents: 19246 diff changeset	959
b43ed416bc2d run-tests: regroup some initialization checks Matt Mackall <mpm@selenic.com> parents: 19246 diff changeset	960 if os.path.exists(err):
b43ed416bc2d run-tests: regroup some initialization checks Matt Mackall <mpm@selenic.com> parents: 19246 diff changeset	961 os.remove(err) # Remove any previous output files
b43ed416bc2d run-tests: regroup some initialization checks Matt Mackall <mpm@selenic.com> parents: 19246 diff changeset	962
10406 6586a6889f66 run-tests.py: skipped tests shouldn't change working directory Mads Kiilerich <mads@kiilerich.com> parents: 10336 diff changeset	963 # Make a tmp subdirectory to work in
19274 6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	964 threadtmp = os.path.join(HGTMP, "child%d" % count)
6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	965 testtmp = os.path.join(threadtmp, os.path.basename(test))
6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	966 os.mkdir(threadtmp)
19243 050c6fae40d2 run-tests: regroup temp dir creation Matt Mackall <mpm@selenic.com> parents: 19242 diff changeset	967 os.mkdir(testtmp)
13764 8ed67e44c71c tests: set HOME to the test temp dir (issue2707) Idan Kamara <idankk86@gmail.com> parents: 13539 diff changeset	968
19275 de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	969 port = options.port + count * 3
15449 f71d60da58fb tests: ignore \r on windows Mads Kiilerich <mads@kiilerich.com> parents: 15448 diff changeset	970 replacements = [
19275 de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	971 (r':%s\b' % port, ':$HGPORT'),
de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	972 (r':%s\b' % (port + 1), ':$HGPORT1'),
de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	973 (r':%s\b' % (port + 2), ':$HGPORT2'),
15449 f71d60da58fb tests: ignore \r on windows Mads Kiilerich <mads@kiilerich.com> parents: 15448 diff changeset	974 ]
f71d60da58fb tests: ignore \r on windows Mads Kiilerich <mads@kiilerich.com> parents: 15448 diff changeset	975 if os.name == 'nt':
15451 23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	976 replacements.append(
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	977 (''.join(c.isalpha() and '[%s%s]' % (c.lower(), c.upper()) or
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	978 c in '/\\' and r'[/\\]' or
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	979 c.isdigit() and c or
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	980 '\\' + c
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	981 for c in testtmp), '$TESTTMP'))
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	982 else:
23144f06919c run-tests: make $TESTTMP matching case-insensitive on windows Mads Kiilerich <mads@kiilerich.com> parents: 15450 diff changeset	983 replacements.append((re.escape(testtmp), '$TESTTMP'))
15449 f71d60da58fb tests: ignore \r on windows Mads Kiilerich <mads@kiilerich.com> parents: 15448 diff changeset	984
19275 de44cf138761 run-tests: use count to calculate port to use Matt Mackall <mpm@selenic.com> parents: 19274 diff changeset	985 env = createenv(options, testtmp, threadtmp, port)
19268 36dc45b1f427 run-tests: move HGRCPATH to env Matt Mackall <mpm@selenic.com> parents: 19267 diff changeset	986 createhgrc(env['HGRCPATH'], options)
36dc45b1f427 run-tests: move HGRCPATH to env Matt Mackall <mpm@selenic.com> parents: 19267 diff changeset	987
19302 a1b8b1b9e2e2 run-tests: always gather runtimes Matt Mackall <mpm@selenic.com> parents: 19301 diff changeset	988 starttime = time.time()
19300 d7d40600a248 run-tests: report interrupted tests Simon Heimberg <simohe@besonet.ch> parents: 19299 diff changeset	989 try:
d7d40600a248 run-tests: report interrupted tests Simon Heimberg <simohe@besonet.ch> parents: 19299 diff changeset	990 ret, out = runner(testpath, testtmp, options, replacements, env)
d7d40600a248 run-tests: report interrupted tests Simon Heimberg <simohe@besonet.ch> parents: 19299 diff changeset	991 except KeyboardInterrupt:
19302 a1b8b1b9e2e2 run-tests: always gather runtimes Matt Mackall <mpm@selenic.com> parents: 19301 diff changeset	992 endtime = time.time()
19304 59d5281b5799 run-tests: simplify interrupted message Matt Mackall <mpm@selenic.com> parents: 19303 diff changeset	993 log('INTERRUPTED: %s (after %d seconds)' % (test, endtime - starttime))
19300 d7d40600a248 run-tests: report interrupted tests Simon Heimberg <simohe@besonet.ch> parents: 19299 diff changeset	994 raise
19302 a1b8b1b9e2e2 run-tests: always gather runtimes Matt Mackall <mpm@selenic.com> parents: 19301 diff changeset	995 endtime = time.time()
a1b8b1b9e2e2 run-tests: always gather runtimes Matt Mackall <mpm@selenic.com> parents: 19301 diff changeset	996 times.append((test, endtime - starttime))
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	997 vlog("# Ret was:", ret)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	998
19263 062c0a0a5549 run-tests: use env dict to kill daemons Matt Mackall <mpm@selenic.com> parents: 19262 diff changeset	999 killdaemons(env['DAEMON_PIDS'])
18051 48f797ac0879 tests: kill daemons early, making breaking at "Accept" prompt safe Mads Kiilerich <madski@unity3d.com> parents: 18050 diff changeset	1000
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	1001 skipped = (ret == SKIPPED_STATUS)
11040 8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1002
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1003 # If we're not in --debug mode and reference output file exists,
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1004 # check test output against it.
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1005 if options.debug:
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 13002 diff changeset	1006 refout = None # to match "out is None"
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1007 elif os.path.exists(ref):
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	1008 f = open(ref, "r")
17742 405b6bd015df run-tests: allow test output lines to be terminated with \r in addition to \n Mads Kiilerich <mads@kiilerich.com> parents: 17741 diff changeset	1009 refout = f.read().splitlines(True)
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	1010 f.close()
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	1011 else:
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	1012 refout = []
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1013
11040 8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1014 if (ret != 0 or out != refout) and not skipped and not options.debug:
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1015 # Save errors to a file for diagnosis
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1016 f = open(err, "wb")
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1017 for line in out:
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1018 f.write(line)
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1019 f.close()
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1020
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	1021 if skipped:
9707 38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1022 if out is None: # debug mode: nothing to parse
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1023 missing = ['unknown']
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1024 failed = None
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1025 else:
38deec407f8d run-tests: add "debug" mode: don't capture child output, just show it. Greg Ward <greg-hg@gerg.ca> parents: 9706 diff changeset	1026 missing, failed = parsehghaveoutput(out)
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	1027 if not missing:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	1028 missing = ['irrelevant']
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	1029 if failed:
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1030 result = fail("hghave failed checking for %s" % failed[-1], ret)
8060 84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	1031 skipped = False
84d0fe34427b run-tests: detect when hghave fails to check for a feature and fail test Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7813 diff changeset	1032 else:
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1033 result = skip(missing[-1])
14001 9c4da6ab4e5a run-tests: switch timeout handling from alarm to helper thread Matt Mackall <mpm@selenic.com> parents: 14000 diff changeset	1034 elif ret == 'timeout':
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1035 result = fail("timed out", ret)
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	1036 elif out != refout:
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1037 info = {}
14006 a395575691a6 run-tests: display diff before prompting with --interactive Patrick Mezard <pmezard@gmail.com> parents: 14003 diff changeset	1038 if not options.nodiff:
14002 a738c30d4b18 run-tests: add a lock for console I/O Matt Mackall <mpm@selenic.com> parents: 14001 diff changeset	1039 iolock.acquire()
11040 8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1040 if options.view:
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1041 os.system("%s %s %s" % (options.view, ref, err))
8f951ed6c63c run-tests: add --view switch to use external diff viewer Matt Mackall <mpm@selenic.com> parents: 11039 diff changeset	1042 else:
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1043 info = showdiff(refout, out, ref, err)
14002 a738c30d4b18 run-tests: add a lock for console I/O Matt Mackall <mpm@selenic.com> parents: 14001 diff changeset	1044 iolock.release()
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1045 msg = ""
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1046 if info.get('servefail'): msg += "serve failed and "
14006 a395575691a6 run-tests: display diff before prompting with --interactive Patrick Mezard <pmezard@gmail.com> parents: 14003 diff changeset	1047 if ret:
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1048 msg += "output changed and " + describe(ret)
14006 a395575691a6 run-tests: display diff before prompting with --interactive Patrick Mezard <pmezard@gmail.com> parents: 14003 diff changeset	1049 else:
21022 52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1050 msg += "output changed"
52e9e63f1495 run-tests: test result shows when a failed test could not start a server Simon Heimberg <simohe@besonet.ch> parents: 21009 diff changeset	1051 result = fail(msg, ret)
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	1052 elif ret:
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1053 result = fail(describe(ret), ret)
14037 4ab1e987941b run-tests: don't count test as succeeded if it failed Idan Kamara <idankk86@gmail.com> parents: 14019 diff changeset	1054 else:
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1055 result = success()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	1056
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	1057 if not options.verbose:
14002 a738c30d4b18 run-tests: add a lock for console I/O Matt Mackall <mpm@selenic.com> parents: 14001 diff changeset	1058 iolock.acquire()
19249 de45df2688a9 run-tests: unify marks and result codes Matt Mackall <mpm@selenic.com> parents: 19248 diff changeset	1059 sys.stdout.write(result[0])
5470 8374f3f081f2 tests: tidy up reporting of skipped tests Matt Mackall <mpm@selenic.com> parents: 5388 diff changeset	1060 sys.stdout.flush()
14002 a738c30d4b18 run-tests: add a lock for console I/O Matt Mackall <mpm@selenic.com> parents: 14001 diff changeset	1061 iolock.release()
5470 8374f3f081f2 tests: tidy up reporting of skipped tests Matt Mackall <mpm@selenic.com> parents: 5388 diff changeset	1062
6208 c88b9e597588 tests: add --keep-tmp to run-tests.py to debug test environment Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6004 diff changeset	1063 if not options.keep_tmpdir:
19274 6f666780f846 run-tests: introduce threadtmp directory Matt Mackall <mpm@selenic.com> parents: 19273 diff changeset	1064 shutil.rmtree(threadtmp, True)
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1065 return result
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	1066
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1067 _hgpath = None
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1068
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1069 def _gethgpath():
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1070 """Return the path to the mercurial package that is actually found by
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1071 the current Python interpreter."""
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1072 global _hgpath
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1073 if _hgpath is not None:
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1074 return _hgpath
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1075
19759 1b8054b98d68 run-tests: find mercurial path with syntax valid on both py2 and py3 Augie Fackler <raf@durin42.com> parents: 19758 diff changeset	1076 cmd = '%s -c "import mercurial; print (mercurial.__path__[0])"'
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1077 pipe = os.popen(cmd % PYTHON)
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1078 try:
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1079 _hgpath = pipe.read().strip()
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1080 finally:
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1081 pipe.close()
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1082 return _hgpath
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1083
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1084 def _checkhglib(verb):
d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1085 """Ensure that the 'mercurial' package imported by python is
8673 a8066f2fd1aa run-tests: fix _checkhglib() so it's correct when using --with-hg. Greg Ward <greg-hg@gerg.ca> parents: 8672 diff changeset	1086 the one we expect it to be. If not, print a warning to stderr."""
a8066f2fd1aa run-tests: fix _checkhglib() so it's correct when using --with-hg. Greg Ward <greg-hg@gerg.ca> parents: 8672 diff changeset	1087 expecthg = os.path.join(PYTHONDIR, 'mercurial')
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1088 actualhg = _gethgpath()
14263 7352ff757a48 run-tests: compare absolute paths in _checkhglib Idan Kamara <idankk86@gmail.com> parents: 14202 diff changeset	1089 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
8673 a8066f2fd1aa run-tests: fix _checkhglib() so it's correct when using --with-hg. Greg Ward <greg-hg@gerg.ca> parents: 8672 diff changeset	1090 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
a8066f2fd1aa run-tests: fix _checkhglib() so it's correct when using --with-hg. Greg Ward <greg-hg@gerg.ca> parents: 8672 diff changeset	1091 ' (expected %s)\n'
a8066f2fd1aa run-tests: fix _checkhglib() so it's correct when using --with-hg. Greg Ward <greg-hg@gerg.ca> parents: 8672 diff changeset	1092 % (verb, actualhg, expecthg))
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1093
20506 a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1094 results = {'.':[], '!':[], '~': [], 's':[], 'i':[]}
17921 4ac9cf3d810c run-tests: add --time option to log times for each test Siddharth Agarwal <sid0@fb.com> parents: 17920 diff changeset	1095 times = []
14002 a738c30d4b18 run-tests: add a lock for console I/O Matt Mackall <mpm@selenic.com> parents: 14001 diff changeset	1096 iolock = threading.Lock()
19273 f3effc499288 run-tests: add abort flag Matt Mackall <mpm@selenic.com> parents: 19272 diff changeset	1097 abort = False
14000 636a6f5aa2cd run-tests: add locking on results struct Matt Mackall <mpm@selenic.com> parents: 13999 diff changeset	1098
19276 e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1099 def scheduletests(options, tests):
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1100 jobs = options.jobs
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1101 done = queue.Queue()
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1102 running = 0
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1103 count = 0
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1104 global abort
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1105
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1106 def job(test, count):
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1107 try:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1108 done.put(runone(options, test, count))
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1109 except KeyboardInterrupt:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1110 pass
20258 3cd441353d6b run-tests: report tests as failed when run-test raises an error Simon Heimberg <simohe@besonet.ch> parents: 20219 diff changeset	1111 except: # re-raises
3cd441353d6b run-tests: report tests as failed when run-test raises an error Simon Heimberg <simohe@besonet.ch> parents: 20219 diff changeset	1112 done.put(('!', test, 'run-test raised an error, see traceback'))
3cd441353d6b run-tests: report tests as failed when run-test raises an error Simon Heimberg <simohe@besonet.ch> parents: 20219 diff changeset	1113 raise
19248 6a127fa5de23 run-tests: change return code of runone Matt Mackall <mpm@selenic.com> parents: 19247 diff changeset	1114
19276 e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1115 try:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1116 while tests or running:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1117 if not done.empty() or running == jobs or not tests:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1118 try:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1119 code, test, msg = done.get(True, 1)
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1120 results[code].append((test, msg))
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1121 if options.first and code not in '.si':
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1122 break
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1123 except queue.Empty:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1124 continue
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1125 running -= 1
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1126 if tests and not running == jobs:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1127 test = tests.pop(0)
19283 8300adf9ca33 run-tests: add --loop support Matt Mackall <mpm@selenic.com> parents: 19282 diff changeset	1128 if options.loop:
8300adf9ca33 run-tests: add --loop support Matt Mackall <mpm@selenic.com> parents: 19282 diff changeset	1129 tests.append(test)
20259 bb4aac9b048c run-tests: set the thread name to the test name for info on error Simon Heimberg <simohe@besonet.ch> parents: 20258 diff changeset	1130 t = threading.Thread(target=job, name=test, args=(test, count))
19276 e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1131 t.start()
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1132 running += 1
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1133 count += 1
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1134 except KeyboardInterrupt:
e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1135 abort = True
13995 b29b7cbc252f run-tests: move test loop into a helper function Matt Mackall <mpm@selenic.com> parents: 13994 diff changeset	1136
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1137 def runtests(options, tests):
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	1138 try:
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1139 if INST:
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	1140 installhg(options)
8672 d6b243731763 run-tests: factor out _checkhglib() to check import path of 'mercurial'. Greg Ward <greg-hg@gerg.ca> parents: 8671 diff changeset	1141 _checkhglib("Testing")
18048 9b7288fc7bf2 run-tests: use correct python when run with --local Bryan O'Sullivan <bryano@fb.com> parents: 17967 diff changeset	1142 else:
9b7288fc7bf2 run-tests: use correct python when run with --local Bryan O'Sullivan <bryano@fb.com> parents: 17967 diff changeset	1143 usecorrectpython()
6982 9fc5bf4adbcf imported patch test-check Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6681 diff changeset	1144
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1145 if options.restart:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1146 orig = list(tests)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1147 while tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1148 if os.path.exists(tests[0] + ".err"):
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1149 break
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1150 tests.pop(0)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1151 if not tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1152 print "running all tests"
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1153 tests = orig
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	1154
19276 e55751963889 run-tests: introduce thread scheduler Matt Mackall <mpm@selenic.com> parents: 19275 diff changeset	1155 scheduletests(options, tests)
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	1156
19249 de45df2688a9 run-tests: unify marks and result codes Matt Mackall <mpm@selenic.com> parents: 19248 diff changeset	1157 failed = len(results['!'])
20506 a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1158 warned = len(results['~'])
a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1159 tested = len(results['.']) + failed + warned
13994 f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	1160 skipped = len(results['s'])
f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	1161 ignored = len(results['i'])
f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	1162
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1163 print
19294 3c3f6b83f8cb run-tests: make --noskips work Matt Mackall <mpm@selenic.com> parents: 19283 diff changeset	1164 if not options.noskips:
3c3f6b83f8cb run-tests: make --noskips work Matt Mackall <mpm@selenic.com> parents: 19283 diff changeset	1165 for s in results['s']:
3c3f6b83f8cb run-tests: make --noskips work Matt Mackall <mpm@selenic.com> parents: 19283 diff changeset	1166 print "Skipped %s: %s" % s
20506 a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1167 for s in results['~']:
a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1168 print "Warned %s: %s" % s
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1169 for s in results['!']:
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1170 print "Failed %s: %s" % s
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1171 _checkhglib("Tested")
20506 a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1172 print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
a46c9fea6c73 run-tests: introduce 'warned' as test result Simon Heimberg <simohe@besonet.ch> parents: 20505 diff changeset	1173 tested, skipped + ignored, warned, failed)
20046 6a03695fa72a tests: python hash seed is only relevant after failures - otherwise keep quiet Mads Kiilerich <madski@unity3d.com> parents: 20019 diff changeset	1174 if results['!']:
6a03695fa72a tests: python hash seed is only relevant after failures - otherwise keep quiet Mads Kiilerich <madski@unity3d.com> parents: 20019 diff changeset	1175 print 'python hash seed:', os.environ['PYTHONHASHSEED']
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1176 if options.time:
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1177 outputtimes(options)
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	1178
8095 f5428d4ffd97 run-tests: reduce global variables set by parse_args(). Greg Ward <greg-hg@gerg.ca> parents: 8094 diff changeset	1179 if options.anycoverage:
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	1180 outputcoverage(options)
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	1181 except KeyboardInterrupt:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	1182 failed = True
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1183 print "\ninterrupted!"
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	1184
13994 f31a5b7f5c07 run-tests: use a results dict Matt Mackall <mpm@selenic.com> parents: 13993 diff changeset	1185 if failed:
20505 eca34583cd87 run-tests: handle sys.exit in main function Simon Heimberg <simohe@besonet.ch> parents: 20504 diff changeset	1186 return 1
20507 38444739a69f run-tests: separate exit code when no failed tests but warned ones Simon Heimberg <simohe@besonet.ch> parents: 20506 diff changeset	1187 if warned:
38444739a69f run-tests: separate exit code when no failed tests but warned ones Simon Heimberg <simohe@besonet.ch> parents: 20506 diff changeset	1188 return 80
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	1189
19239 db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	1190 testtypes = [('.py', pytest, '.out'),
db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	1191 ('.t', tsttest, '')]
db978c792b02 run-tests: make a table of test types Matt Mackall <mpm@selenic.com> parents: 19238 diff changeset	1192
21008 c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	1193 def main(args, parser=None):
c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	1194 parser = parser or getparser()
c1dd04be3d9a run-tests: allow option parser to be extended Gregory Szorc <gregory.szorc@gmail.com> parents: 21007 diff changeset	1195 (options, args) = parseargs(args, parser)
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1196 os.umask(022)
8093 70d8f70264c4 run-tests: move bits of main program so it's all at the bottom. Greg Ward <greg-hg@gerg.ca> parents: 8092 diff changeset	1197
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1198 checktools()
8093 70d8f70264c4 run-tests: move bits of main program so it's all at the bottom. Greg Ward <greg-hg@gerg.ca> parents: 8092 diff changeset	1199
20793 60c175c1e708 tests: small refactoring of run-tests' handling of tests list Mads Kiilerich <madski@unity3d.com> parents: 20680 diff changeset	1200 if not args:
20821 3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1201 if options.changed:
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1202 proc = Popen4('hg st --rev "%s" -man0 .' % options.changed,
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1203 None, 0)
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1204 stdout, stderr = proc.communicate()
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1205 args = stdout.strip('\0').split('\0')
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1206 else:
3d1d16b19e7d tests: add run-tests --changed option for running tests changed in revisions Mads Kiilerich <madski@unity3d.com> parents: 20793 diff changeset	1207 args = os.listdir(".")
12677 9848a94e2ad6 run-tests.py: do not install hg when the tests do no exist Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12643 diff changeset	1208
20793 60c175c1e708 tests: small refactoring of run-tests' handling of tests list Mads Kiilerich <madski@unity3d.com> parents: 20680 diff changeset	1209 tests = [t for t in args
21009 990f5392c018 run-tests: allow test paths in other directories Gregory Szorc <gregory.szorc@gmail.com> parents: 21008 diff changeset	1210 if os.path.basename(t).startswith("test-")
990f5392c018 run-tests: allow test paths in other directories Gregory Szorc <gregory.szorc@gmail.com> parents: 21008 diff changeset	1211 and (t.endswith(".py") or t.endswith(".t"))]
12677 9848a94e2ad6 run-tests.py: do not install hg when the tests do no exist Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12643 diff changeset	1212
19057 3d265e0822d3 run-tests: introduce --random for running tests in random error Mads Kiilerich <madski@unity3d.com> parents: 18788 diff changeset	1213 if options.random:
3d265e0822d3 run-tests: introduce --random for running tests in random error Mads Kiilerich <madski@unity3d.com> parents: 18788 diff changeset	1214 random.shuffle(tests)
19277 09e1c148e847 run-tests: schedule largest tests first Matt Mackall <mpm@selenic.com> parents: 19276 diff changeset	1215 else:
19281 0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1216 # keywords for slow tests
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1217 slow = 'svn gendoc check-code-hg'.split()
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1218 def sortkey(f):
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1219 # run largest tests first, as they tend to take the longest
19315 401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1220 try:
401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1221 val = -os.stat(f).st_size
401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1222 except OSError, e:
401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1223 if e.errno != errno.ENOENT:
401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1224 raise
401b3ad26e66 run-tests: sort missing files first instead of raising an error simon@laptop-tosh parents: 19312 diff changeset	1225 return -1e9 # file does not exist, tell early
19281 0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1226 for kw in slow:
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1227 if kw in f:
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1228 val *= 10
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1229 return val
0a5e19007cd1 run-tests: sort certain slow tests earlier by keyword Matt Mackall <mpm@selenic.com> parents: 19280 diff changeset	1230 tests.sort(key=sortkey)
19057 3d265e0822d3 run-tests: introduce --random for running tests in random error Mads Kiilerich <madski@unity3d.com> parents: 18788 diff changeset	1231
18616 35b4affe6fdd test: display used python hash seed Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18565 diff changeset	1232 if 'PYTHONHASHSEED' not in os.environ:
35b4affe6fdd test: display used python hash seed Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18565 diff changeset	1233 # use a random python hash seed all the time
35b4affe6fdd test: display used python hash seed Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18565 diff changeset	1234 # we do the randomness ourself to know what seed is used
35b4affe6fdd test: display used python hash seed Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18565 diff changeset	1235 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
8093 70d8f70264c4 run-tests: move bits of main program so it's all at the bottom. Greg Ward <greg-hg@gerg.ca> parents: 8092 diff changeset	1236
20541 44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1237 global TESTDIR, HGTMP, INST, BINDIR, TMPBINDIR, PYTHONDIR, COVERAGE_FILE
16897 2774576dee4d tests/run-tests: avoid C:/ in arguments Adrian Buehlmann <adrian@cadifra.com> parents: 16890 diff changeset	1238 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
9706 f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1239 if options.tmpdir:
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1240 options.keep_tmpdir = True
9706 f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1241 tmpdir = options.tmpdir
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1242 if os.path.exists(tmpdir):
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1243 # Meaning of tmpdir has changed since 1.3: we used to create
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1244 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1245 # tmpdir already exists.
21007 57179a4bf77a run-tests: use return values instead of sys.exit Gregory Szorc <gregory.szorc@gmail.com> parents: 21006 diff changeset	1246 print "error: temp dir %r already exists" % tmpdir
57179a4bf77a run-tests: use return values instead of sys.exit Gregory Szorc <gregory.szorc@gmail.com> parents: 21006 diff changeset	1247 return 1
9706 f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1248
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1249 # Automatically removing tmpdir sounds convenient, but could
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1250 # really annoy anyone in the habit of using "--tmpdir=/tmp"
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1251 # or "--tmpdir=$HOME".
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1252 #vlog("# Removing temp dir", tmpdir)
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1253 #shutil.rmtree(tmpdir)
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1254 os.makedirs(tmpdir)
f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1255 else:
16890 4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1256 d = None
4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1257 if os.name == 'nt':
4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1258 # without this, we get the default temp dir location, but
4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1259 # in all lowercase, which causes troubles with paths (issue3490)
4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1260 d = os.getenv('TMP')
4d95878712ad tests/run-tests: use $TMP on Windows (issue3490) Adrian Buehlmann <adrian@cadifra.com> parents: 16842 diff changeset	1261 tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
9706 f8b4df4b033d run-tests: make --tmpdir option more useful. Greg Ward <greg-hg@gerg.ca> parents: 9582 diff changeset	1262 HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir)
8093 70d8f70264c4 run-tests: move bits of main program so it's all at the bottom. Greg Ward <greg-hg@gerg.ca> parents: 8092 diff changeset	1263
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1264 if options.with_hg:
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1265 INST = None
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1266 BINDIR = os.path.dirname(os.path.realpath(options.with_hg))
20541 44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1267 TMPBINDIR = os.path.join(HGTMP, 'install', 'bin')
44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1268 os.makedirs(TMPBINDIR)
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1269
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1270 # This looks redundant with how Python initializes sys.path from
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1271 # the location of the script being executed. Needed because the
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1272 # "hg" specified by --with-hg is not the only Python script
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1273 # executed in the test suite that needs to import 'mercurial'
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1274 # ... which means it's not really redundant at all.
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1275 PYTHONDIR = BINDIR
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1276 else:
60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1277 INST = os.path.join(HGTMP, "install")
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1278 BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
20541 44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1279 TMPBINDIR = BINDIR
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1280 PYTHONDIR = os.path.join(INST, "lib", "python")
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1281
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1282 os.environ["BINDIR"] = BINDIR
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1283 os.environ["PYTHON"] = PYTHON
0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1284
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1285 path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
20541 44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1286 if TMPBINDIR != BINDIR:
44dcca9be1d5 run-tests.py: work when --with-hg is set to system hg Siddharth Agarwal <sid0@fb.com> parents: 20513 diff changeset	1287 path = [TMPBINDIR] + path
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1288 os.environ["PATH"] = os.pathsep.join(path)
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1289
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1290 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1291 # can run .../tests/run-tests.py test-foo where test-foo
20513 dcd3bebf4786 run-tests: fix heredoctest for out-of-tree extensions Patrick Mezard <patrick@mezard.eu> parents: 20510 diff changeset	1292 # adds an extension to HGRC. Also include run-test.py directory to import
dcd3bebf4786 run-tests: fix heredoctest for out-of-tree extensions Patrick Mezard <patrick@mezard.eu> parents: 20510 diff changeset	1293 # modules like heredoctest.
dcd3bebf4786 run-tests: fix heredoctest for out-of-tree extensions Patrick Mezard <patrick@mezard.eu> parents: 20510 diff changeset	1294 pypath = [PYTHONDIR, TESTDIR, os.path.abspath(os.path.dirname(__file__))]
19279 3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1295 # We have to augment PYTHONPATH, rather than simply replacing
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1296 # it, in case external libraries are only available via current
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1297 # PYTHONPATH. (In particular, the Subversion bindings on OS X
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1298 # are in /opt/subversion.)
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1299 oldpypath = os.environ.get(IMPL_PATH)
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1300 if oldpypath:
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1301 pypath.append(oldpypath)
3868c9ab4bf8 run-tests: drop options.child and users Matt Mackall <mpm@selenic.com> parents: 19278 diff changeset	1302 os.environ[IMPL_PATH] = os.pathsep.join(pypath)
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1303
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1304 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
8093 70d8f70264c4 run-tests: move bits of main program so it's all at the bottom. Greg Ward <greg-hg@gerg.ca> parents: 8092 diff changeset	1305
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1306 vlog("# Using TESTDIR", TESTDIR)
60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1307 vlog("# Using HGTMP", HGTMP)
8674 0941ee76489e run-tests: redefine --with-hg so it takes the 'hg' script to run. Greg Ward <greg-hg@gerg.ca> parents: 8673 diff changeset	1308 vlog("# Using PATH", os.environ["PATH"])
10758 2ed667a9dfcb tests: adapt the test runner to work with jython Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10750 diff changeset	1309 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	1310
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1311 try:
21007 57179a4bf77a run-tests: use return values instead of sys.exit Gregory Szorc <gregory.szorc@gmail.com> parents: 21006 diff changeset	1312 return runtests(options, tests) or 0
8094 60a9e3cf0cf4 run-tests: factor out main(); reduce use of globals a bit. Greg Ward <greg-hg@gerg.ca> parents: 8093 diff changeset	1313 finally:
16346 48692b416fbc tests: shorten post-test sleeps Matt Mackall <mpm@selenic.com> parents: 15942 diff changeset	1314 time.sleep(.1)
8097 eea3c1a8fba8 run-tests: removed some underscores (coding style) Martin Geisler <mg@lazybytes.net> parents: 8096 diff changeset	1315 cleanup(options)
5384 e3a0c092b4e2 Allow tests to run in parallel. Bryan O'Sullivan <bos@serpentine.com> parents: 5383 diff changeset	1316
13347 ce07defe7d9f run-tests: loadable as module Simon Heimberg <simohe@besonet.ch> parents: 13031 diff changeset	1317 if __name__ == '__main__':
21007 57179a4bf77a run-tests: use return values instead of sys.exit Gregory Szorc <gregory.szorc@gmail.com> parents: 21006 diff changeset	1318 sys.exit(main(sys.argv[1:]))

Mercurial > public > mercurial-scm > hg-stable

annotate tests/run-tests.py @ 21022:52e9e63f1495