mercurial-crew-with-dirclash: tests/run-tests.py annotate

annotate tests/run-tests.py @ 4095:6fa7a2d0fc2e

hgweb: catch util.Abort raised by addchangegroup Right now, if a pretxnchangegroup hook fails, we send some HTML error message to the client and the transaction is not rolled back (issue499). Catching util.Abort allows us to send a decent message to the client and for some reason makes the rollback complete. This patch is not perfect since it doesn't fix the reason why the transaction wasn't rolled back (maybe some circular references?). Also, the transaction is aborted only after we've sent the response back to the client and the "transaction aborted" message ends up in the logs of the web server.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Fri, 16 Feb 2007 05:10:43 -0200
parents	037824e6d362
children	b95a42114616

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 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	7 # This software may be used and distributed according to the terms
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	8 # of the GNU General Public License, incorporated herein by reference.
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	9
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	10 import difflib
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	11 import errno
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	12 import optparse
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	13 import os
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	14 import popen2
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	15 import re
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	16 import shutil
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	17 import signal
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	18 import sys
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	19 import tempfile
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	20 import time
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	21
2611 1b4eb1f92433 Add merge to list of required tools. Lee Cantey <lcantey@gmail.com> parents: 2576 diff changeset	22 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"]
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	23
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	24 parser = optparse.OptionParser("%prog [options] [tests]")
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	25 parser.add_option("-v", "--verbose", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	26 help="output verbose messages")
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	27 parser.add_option("-t", "--timeout", type="int",
2672 118b198c9423 Provide a relevant description for --timeout. Will Maier <willmaier@ml1.net> parents: 2611 diff changeset	28 help="kill errant tests after TIMEOUT seconds")
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	29 parser.add_option("-c", "--cover", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	30 help="print a test coverage report")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	31 parser.add_option("-s", "--cover_stdlib", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	32 help="print a test coverage report inc. standard libraries")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	33 parser.add_option("-C", "--annotate", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	34 help="output files annotated with coverage")
3306 642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3215 diff changeset	35 parser.add_option("-r", "--retest", action="store_true",
642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3215 diff changeset	36 help="retest failed tests")
3307 3cd51b986172 run-tests: add --first switch to exit on first error Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	37 parser.add_option("-f", "--first", action="store_true",
3cd51b986172 run-tests: add --first switch to exit on first error Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	38 help="exit on the first test failure")
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	39 parser.add_option("-R", "--restart", action="store_true",
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	40 help="restart at last error")
3626 02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	41 parser.add_option("-i", "--interactive", action="store_true",
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	42 help="prompt to accept changed output")
3306 642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3215 diff changeset	43
2576 6a961a54f953 Changed default timeout for run-tests.py from 30 to 180 seconds. Thomas Arendsen Hein <thomas@intevation.de> parents: 2570 diff changeset	44 parser.set_defaults(timeout=180)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	45 (options, args) = parser.parse_args()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	46 verbose = options.verbose
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	47 coverage = options.cover or options.cover_stdlib or options.annotate
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	48
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	49 def vlog(*msg):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	50 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	51 for m in msg:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	52 print m,
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	53 print
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	54
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	55 def splitnewlines(text):
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	56 '''like str.splitlines, but only split on newlines.
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	57 keep line endings.'''
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	58 i = 0
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	59 lines = []
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	60 while True:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	61 n = text.find('\n', i)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	62 if n == -1:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	63 last = text[i:]
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	64 if last:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	65 lines.append(last)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	66 return lines
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	67 lines.append(text[i:n+1])
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	68 i = n + 1
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	69
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	70 def show_diff(expected, output):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	71 for line in difflib.unified_diff(expected, output,
2409 4068d6a7a99e Fix diff header (line endings) for failed test output in run-tests.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2408 diff changeset	72 "Expected output", "Test output"):
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	73 sys.stdout.write(line)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	74
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	75 def find_program(program):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	76 """Search PATH for a executable program"""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	77 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	78 name = os.path.join(p, program)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	79 if os.access(name, os.X_OK):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	80 return name
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	81 return None
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	82
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	83 def check_required_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	84 # 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	85 # stuff from coreutils (cat, rm, etc) are not tested
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	86 for p in required_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	87 if os.name == 'nt':
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	88 p += '.exe'
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	89 found = find_program(p)
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	90 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	91 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	92 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	93 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	94
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	95 def cleanup_exit():
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	96 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	97 print "# Cleaning up HGTMP", HGTMP
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	98 shutil.rmtree(HGTMP, True)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	99
2569 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	100 def use_correct_python():
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	101 # 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	102 # interpreter we use or bad things will happen.
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	103 exedir, exename = os.path.split(sys.executable)
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	104 if exename == 'python':
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	105 path = find_program('python')
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	106 if os.path.dirname(path) == exedir:
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	107 return
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	108 vlog('# Making python executable in test path use correct Python')
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	109 my_python = os.path.join(BINDIR, 'python')
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	110 try:
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	111 os.symlink(sys.executable, my_python)
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	112 except AttributeError:
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	113 # windows fallback
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	114 shutil.copyfile(sys.executable, my_python)
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	115 shutil.copymode(sys.executable, my_python)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2975 diff changeset	116
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	117 def install_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	118 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	119 installerrs = os.path.join("tests", "install.err")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	120
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	121 os.chdir("..") # Get back to hg root
2183 a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	122 cmd = ('%s setup.py clean --all'
a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	123 ' install --force --home="%s" --install-lib="%s" >%s 2>&1'
a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	124 % (sys.executable, INST, PYTHONDIR, 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	125 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	126 if os.system(cmd) == 0:
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	127 if not verbose:
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	128 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	129 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	130 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	131 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	132 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	133 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	134 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	135 os.chdir(TESTDIR)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	136
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	137 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
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	138 os.environ["PYTHONPATH"] = PYTHONDIR
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	139
2569 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	140 use_correct_python()
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	141
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	142 if coverage:
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	143 vlog("# Installing coverage wrapper")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	144 os.environ['COVERAGE_FILE'] = COVERAGE_FILE
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	145 if os.path.exists(COVERAGE_FILE):
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	146 os.unlink(COVERAGE_FILE)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	147 # Create a wrapper script to invoke hg via coverage.py
2146 eb1ed410aa34 run-tests.py: remove trailing white space Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2145 diff changeset	148 os.rename(os.path.join(BINDIR, "hg"), os.path.join(BINDIR, "_hg.py"))
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	149 f = open(os.path.join(BINDIR, 'hg'), 'w')
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	150 f.write('#!' + sys.executable + '\n')
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	151 f.write('import sys, os; os.execv(sys.executable, [sys.executable, '+ \
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	152 '"%s", "-x", "%s"] + sys.argv[1:])\n' % (
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	153 os.path.join(TESTDIR, 'coverage.py'),
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	154 os.path.join(BINDIR, '_hg.py')))
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	155 f.close()
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	156 os.chmod(os.path.join(BINDIR, 'hg'), 0700)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	157
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	158 def output_coverage():
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	159 vlog("# Producing coverage report")
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	160 omit = [BINDIR, TESTDIR, PYTHONDIR]
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	161 if not options.cover_stdlib:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	162 # Exclude as system paths (ignoring empty strings seen on win)
2146 eb1ed410aa34 run-tests.py: remove trailing white space Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2145 diff changeset	163 omit += [x for x in sys.path if x != '']
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	164 omit = ','.join(omit)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	165 os.chdir(PYTHONDIR)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	166 cmd = '"%s" "%s" -r "--omit=%s"' % (
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	167 sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	168 vlog("# Running: "+cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	169 os.system(cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	170 if options.annotate:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	171 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	172 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	173 os.mkdir(adir)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	174 cmd = '"%s" "%s" -a "--directory=%s" "--omit=%s"' % (
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	175 sys.executable, os.path.join(TESTDIR, 'coverage.py'),
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	176 adir, 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	177 vlog("# Running: "+cmd)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	178 os.system(cmd)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	179
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	180 class Timeout(Exception):
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	181 pass
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	182
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	183 def alarmed(signum, frame):
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	184 raise Timeout
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	185
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	186 def run(cmd):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	187 """Run command in a sub-process, capturing the output (stdout and stderr).
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	188 Return the exist code, and output."""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	189 # TODO: Use subprocess.Popen if we're running on Python 2.4
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	190 if os.name == 'nt':
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	191 tochild, fromchild = os.popen4(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	192 tochild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	193 output = fromchild.read()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	194 ret = fromchild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	195 if ret == None:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	196 ret = 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	197 else:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	198 proc = popen2.Popen4(cmd)
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	199 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	200 output = ''
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	201 proc.tochild.close()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	202 output = proc.fromchild.read()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	203 ret = proc.wait()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	204 except Timeout:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	205 vlog('# Process %d timed out - killing it' % proc.pid)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	206 os.kill(proc.pid, signal.SIGTERM)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	207 ret = proc.wait()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	208 if ret == 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	209 ret = signal.SIGTERM << 8
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	210 return ret, splitnewlines(output)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	211
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	212 def run_one(test):
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	213 '''tristate output:
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	214 None -> skipped
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	215 True -> passed
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	216 False -> failed'''
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	217
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	218 vlog("# Test", test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	219 if not verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	220 sys.stdout.write('.')
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	221 sys.stdout.flush()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	222
2975 3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2709 diff changeset	223 # create a fresh hgrc
3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2709 diff changeset	224 hgrc = file(HGRCPATH, 'w+')
3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2709 diff changeset	225 hgrc.close()
3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2709 diff changeset	226
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	227 err = os.path.join(TESTDIR, test+".err")
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	228 ref = os.path.join(TESTDIR, test+".out")
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	229
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	230 if os.path.exists(err):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	231 os.remove(err) # Remove any previous output files
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	232
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	233 # Make a tmp subdirectory to work in
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	234 tmpd = os.path.join(HGTMP, test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	235 os.mkdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	236 os.chdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	237
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	238 lctest = test.lower()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	239
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	240 if lctest.endswith('.py'):
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	241 cmd = '%s "%s"' % (sys.executable, os.path.join(TESTDIR, test))
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	242 elif lctest.endswith('.bat'):
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	243 # do not run batch scripts on non-windows
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	244 if os.name != 'nt':
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	245 print '\nSkipping %s: batch script' % test
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	246 return None
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	247 # To reliably get the error code from batch files on WinXP,
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	248 # the "cmd /c call" prefix is needed. Grrr
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	249 cmd = 'cmd /c call "%s"' % (os.path.join(TESTDIR, test))
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	250 else:
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	251 # do not run shell scripts on windows
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	252 if os.name == 'nt':
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	253 print '\nSkipping %s: shell script' % test
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	254 return None
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	255 # do not try to run non-executable programs
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	256 if not os.access(os.path.join(TESTDIR, test), os.X_OK):
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	257 print '\nSkipping %s: not executable' % test
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	258 return None
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	259 cmd = '"%s"' % (os.path.join(TESTDIR, test))
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	260
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	261 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	262 signal.alarm(options.timeout)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	263
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	264 vlog("# Running", cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	265 ret, out = run(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	266 vlog("# Ret was:", ret)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	267
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	268 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	269 signal.alarm(0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	270
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	271 diffret = 0
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	272 # If reference output file exists, check test output against it
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	273 if os.path.exists(ref):
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	274 f = open(ref, "r")
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	275 ref_out = splitnewlines(f.read())
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	276 f.close()
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	277 else:
2703 d32b31e88391 run-tests.py: fix diff output when test-foo.out doesn't exist. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2702 diff changeset	278 ref_out = []
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	279 if out != ref_out:
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	280 diffret = 1
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	281 print "\nERROR: %s output changed" % (test)
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	282 show_diff(ref_out, out)
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	283 if ret:
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	284 print "\nERROR: %s failed with error code %d" % (test, ret)
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	285 elif diffret:
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	286 ret = diffret
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	287
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	288 if ret != 0: # Save errors to a file for diagnosis
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	289 f = open(err, "wb")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	290 for line in out:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	291 f.write(line)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	292 f.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	293
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	294 # Kill off any leftover daemon processes
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	295 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	296 fp = file(DAEMON_PIDS)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	297 for line in fp:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	298 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	299 pid = int(line)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	300 except ValueError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	301 continue
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	302 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	303 os.kill(pid, 0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	304 vlog('# Killing daemon process %d' % pid)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	305 os.kill(pid, signal.SIGTERM)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	306 time.sleep(0.25)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	307 os.kill(pid, 0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	308 vlog('# Daemon process %d is stuck - really killing it' % pid)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	309 os.kill(pid, signal.SIGKILL)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	310 except OSError, err:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	311 if err.errno != errno.ESRCH:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	312 raise
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	313 fp.close()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	314 os.unlink(DAEMON_PIDS)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	315 except IOError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	316 pass
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	317
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	318 os.chdir(TESTDIR)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	319 shutil.rmtree(tmpd, True)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	320 return ret == 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	321
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	322
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	323 os.umask(022)
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	324
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	325 check_required_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	326
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	327 # Reset some environment variables to well-known values so that
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	328 # the tests produce repeatable output.
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	329 os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
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	330 os.environ['TZ'] = 'GMT'
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	331
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	332 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
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	333 os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"'
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	334 os.environ["HGUSER"] = "test"
3777 037824e6d362 tests: set a default encoding for running tests (ASCII) Matt Mackall <mpm@selenic.com> parents: 3626 diff changeset	335 os.environ["HGENCODING"] = "ascii"
037824e6d362 tests: set a default encoding for running tests (ASCII) Matt Mackall <mpm@selenic.com> parents: 3626 diff changeset	336 os.environ["HGENCODINGMODE"] = "strict"
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	337
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	338 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
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	339 HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	340 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
2975 3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2709 diff changeset	341 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	342
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	343 vlog("# Using TESTDIR", TESTDIR)
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	344 vlog("# Using HGTMP", HGTMP)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	345
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	346 INST = os.path.join(HGTMP, "install")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	347 BINDIR = os.path.join(INST, "bin")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	348 PYTHONDIR = os.path.join(INST, "lib", "python")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	349 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	350
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	351 try:
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	352 try:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	353 install_hg()
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	354
2570 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	355 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	356 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	357 signal.signal(signal.SIGALRM, alarmed)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	358 vlog('# Running tests with %d-second timeout' %
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	359 options.timeout)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	360 except AttributeError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	361 print 'WARNING: cannot run tests with timeouts'
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	362 options.timeout = 0
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	363
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	364 tested = 0
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	365 failed = 0
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	366 skipped = 0
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	367
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	368 if len(args) == 0:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	369 args = os.listdir(".")
3624 a90a86929d04 tests: sort test list if running all tests Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	370 args.sort()
a90a86929d04 tests: sort test list if running all tests Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	371
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	372
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	373 tests = []
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	374 for test in args:
2702 133811a7688b Allow tests that end in .py and .bat Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2611 diff changeset	375 if (test.startswith("test-") and '~' not in test and
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2975 diff changeset	376 ('.' not in test or test.endswith('.py') or
2702 133811a7688b Allow tests that end in .py and .bat Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2611 diff changeset	377 test.endswith('.bat'))):
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	378 tests.append(test)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	379
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	380 if options.restart:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	381 orig = list(tests)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	382 while tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	383 if os.path.exists(tests[0] + ".err"):
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	384 break
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	385 tests.pop(0)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	386 if not tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	387 print "running all tests"
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	388 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	389
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	390 for test in tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	391 if options.retest and not os.path.exists(test + ".err"):
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	392 skipped += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	393 continue
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	394 ret = run_one(test)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	395 if ret is None:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	396 skipped += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	397 elif not ret:
3626 02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	398 if options.interactive:
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	399 print "Accept this change? [n] ",
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	400 answer = sys.stdin.readline().strip()
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	401 if answer.lower() in "y yes".split():
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	402 os.rename(test + ".err", test + ".out")
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	403 tested += 1
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	404 continue
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	405 failed += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	406 if options.first:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	407 break
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	408 tested += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	409
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	410 print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped,
2709 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	411 failed)
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	412 if coverage:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	413 output_coverage()
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	414 except KeyboardInterrupt:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	415 failed = True
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	416 print "\ninterrupted!"
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	417 finally:
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	418 cleanup_exit()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	419
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	420 if failed:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	421 sys.exit(1)

Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/run-tests.py @ 4095:6fa7a2d0fc2e