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

annotate tests/run-tests.py @ 5078:d27ed83289ee

Add message to test output if a test is aborted due to a timeout. Without this an aborted test could produce an empty .err file so the diff looks like as if all lines of the .out files are just missing for some unknown reason.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Mon, 06 Aug 2007 14:45:43 +0200
parents	c51c9bc4579d
children	ea7b982b6c08

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
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 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: 2570 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: 2570 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: 2570 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: 2570 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: 2570 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: 2570 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: 2570 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: 2570 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
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 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
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	22 # hghave reserved exit code to skip test
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	23 SKIPPED_STATUS = 80
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	24
4365 46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	25 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	26
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	27 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	28 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	29 help="output verbose messages")
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	30 parser.add_option("-t", "--timeout", type="int",
2672 118b198c9423 Provide a relevant description for --timeout. Will Maier <willmaier@ml1.net> parents: 2611 diff changeset	31 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	32 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	33 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	34 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	35 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	36 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	37 help="output files annotated with coverage")
3300 642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	38 parser.add_option("-r", "--retest", action="store_true",
642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	39 help="retest failed tests")
3301 3cd51b986172 run-tests: add --first switch to exit on first error Matt Mackall <mpm@selenic.com> parents: 3300 diff changeset	40 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: 3300 diff changeset	41 help="exit on the first test failure")
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	42 parser.add_option("-R", "--restart", action="store_true",
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	43 help="restart at last error")
3626 02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	44 parser.add_option("-i", "--interactive", action="store_true",
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	45 help="prompt to accept changed output")
3300 642e5faf6bf0 run-tests: add --retest switch Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	46
2576 6a961a54f953 Changed default timeout for run-tests.py from 30 to 180 seconds. Thomas Arendsen Hein <thomas@intevation.de> parents: 2571 diff changeset	47 parser.set_defaults(timeout=180)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	48 (options, args) = parser.parse_args()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	49 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	50 coverage = options.cover or options.cover_stdlib or options.annotate
4319 8ece1ba156c7 run-tests.py: use coverage.py with .py tests Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4318 diff changeset	51 python = sys.executable
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	52
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	53 def vlog(*msg):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	54 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	55 for m in msg:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	56 print m,
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	57 print
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	58
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	59 def splitnewlines(text):
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	60 '''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	61 keep line endings.'''
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	62 i = 0
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	63 lines = []
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	64 while True:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	65 n = text.find('\n', i)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	66 if n == -1:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	67 last = text[i:]
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	68 if last:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	69 lines.append(last)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	70 return lines
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	71 lines.append(text[i:n+1])
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	72 i = n + 1
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	73
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	74 def extract_missing_features(lines):
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	75 '''Extract missing/unknown features log lines as a list'''
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	76 missing = []
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	77 for line in lines:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	78 if not line.startswith('hghave: '):
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	79 continue
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	80 line = line.splitlines()[0]
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	81 missing.append(line[8:])
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	82
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	83 return missing
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	84
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	85 def show_diff(expected, output):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	86 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	87 "Expected output", "Test output"):
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	88 sys.stdout.write(line)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	89
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	90 def find_program(program):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	91 """Search PATH for a executable program"""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	92 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	93 name = os.path.join(p, program)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	94 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	95 return name
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	96 return None
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	97
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	98 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	99 # 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	100 # 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	101 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	102 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	103 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	104 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	105 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	106 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	107 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	108 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	109
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	110 def cleanup_exit():
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	111 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	112 print "# Cleaning up HGTMP", HGTMP
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	113 shutil.rmtree(HGTMP, True)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	114
2570 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	115 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	116 # 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	117 # 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	118 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	119 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	120 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	121 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	122 return
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	123 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	124 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	125 try:
2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	126 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	127 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	128 # 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	129 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	130 shutil.copymode(sys.executable, my_python)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2989 diff changeset	131
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	132 def install_hg():
4319 8ece1ba156c7 run-tests.py: use coverage.py with .py tests Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4318 diff changeset	133 global python
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	134 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	135 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	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.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	138 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	139 ' 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	140 % (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	141 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	142 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	143 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	144 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	145 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	146 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	147 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	148 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	149 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	150 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	151 os.chdir(TESTDIR)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	152
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	153 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	154 os.environ["PYTHONPATH"] = PYTHONDIR
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	155
2570 2264b2b077a1 run-tests.py: make tests use same python interpreter as test harness. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2409 diff changeset	156 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	157
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	158 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	159 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	160 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	161 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	162 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	163 # 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	164 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	165 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	166 f.write('#!' + sys.executable + '\n')
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4529 diff changeset	167 f.write('import sys, os; os.execv(sys.executable, [sys.executable, '
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4529 diff changeset	168 '"%s", "-x", "%s"] + sys.argv[1:])\n' %
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4529 diff changeset	169 (os.path.join(TESTDIR, 'coverage.py'),
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4529 diff changeset	170 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	171 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	172 os.chmod(os.path.join(BINDIR, 'hg'), 0700)
4319 8ece1ba156c7 run-tests.py: use coverage.py with .py tests Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4318 diff changeset	173 python = '"%s" "%s" -x' % (sys.executable,
8ece1ba156c7 run-tests.py: use coverage.py with .py tests Alexis S. L. Carvalho <alexis@cecm.usp.br>* parents: 4318 diff changeset	174 os.path.join(TESTDIR,'coverage.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	175
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	176 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	177 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	178 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	179 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	180 # 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	181 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	182 omit = ','.join(omit)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	183 os.chdir(PYTHONDIR)
4318 b95a42114616 run-tests.py: tell coverage.py to ignore errors Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3776 diff changeset	184 cmd = '"%s" "%s" -i -r "--omit=%s"' % (
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	185 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	186 vlog("# Running: "+cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	187 os.system(cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	188 if options.annotate:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	189 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	190 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	191 os.mkdir(adir)
4318 b95a42114616 run-tests.py: tell coverage.py to ignore errors Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3776 diff changeset	192 cmd = '"%s" "%s" -i -a "--directory=%s" "--omit=%s"' % (
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	193 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	194 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	195 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	196 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	197
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	198 class Timeout(Exception):
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	199 pass
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	200
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	201 def alarmed(signum, frame):
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	202 raise Timeout
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	203
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	204 def run(cmd):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	205 """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	206 Return the exist code, and output."""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	207 # 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	208 if os.name == 'nt':
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	209 tochild, fromchild = os.popen4(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	210 tochild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	211 output = fromchild.read()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	212 ret = fromchild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	213 if ret == None:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	214 ret = 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	215 else:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	216 proc = popen2.Popen4(cmd)
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	217 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	218 output = ''
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	219 proc.tochild.close()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	220 output = proc.fromchild.read()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	221 ret = proc.wait()
4880 6403f948bd6b run-tests: extract correct status when script terminates with exit Patrick Mezard <pmezard@gmail.com> parents: 4633 diff changeset	222 if os.WIFEXITED(ret):
6403f948bd6b run-tests: extract correct status when script terminates with exit Patrick Mezard <pmezard@gmail.com> parents: 4633 diff changeset	223 ret = os.WEXITSTATUS(ret)
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	224 except Timeout:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	225 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: 2570 diff changeset	226 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: 2570 diff changeset	227 ret = proc.wait()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	228 if ret == 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	229 ret = signal.SIGTERM << 8
5078 d27ed83289ee Add message to test output if a test is aborted due to a timeout. Thomas Arendsen Hein <thomas@intevation.de> parents: 4881 diff changeset	230 output += ("\n### Abort: timeout after %d seconds.\n"
d27ed83289ee Add message to test output if a test is aborted due to a timeout. Thomas Arendsen Hein <thomas@intevation.de> parents: 4881 diff changeset	231 % options.timeout)
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	232 return ret, splitnewlines(output)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	233
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	234 def run_one(test):
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	235 '''tristate output:
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	236 None -> skipped
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	237 True -> passed
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	238 False -> failed'''
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	239
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	240 vlog("# Test", test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	241 if not verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	242 sys.stdout.write('.')
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	243 sys.stdout.flush()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	244
2989 3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2710 diff changeset	245 # create a fresh hgrc
3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2710 diff changeset	246 hgrc = file(HGRCPATH, 'w+')
4529 860478527568 run-tests.py: set ui.slash = True Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4387 diff changeset	247 hgrc.write('[ui]\n')
860478527568 run-tests.py: set ui.slash = True Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4387 diff changeset	248 hgrc.write('slash = True\n')
2989 3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2710 diff changeset	249 hgrc.close()
3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2710 diff changeset	250
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	251 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	252 ref = os.path.join(TESTDIR, test+".out")
4320 f9b61e0fc929 run-tests.py: small cleanup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4319 diff changeset	253 testpath = os.path.join(TESTDIR, test)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	254
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	255 if os.path.exists(err):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	256 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	257
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	258 # 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	259 tmpd = os.path.join(HGTMP, test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	260 os.mkdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	261 os.chdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	262
4321 99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	263 try:
99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	264 tf = open(testpath)
99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	265 firstline = tf.readline().rstrip()
99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	266 tf.close()
99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	267 except:
99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	268 firstline = ''
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	269 lctest = test.lower()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	270
4321 99184c6fd88f run-tests.py: use coverage.py with "#!/usr/bin/env python" tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4320 diff changeset	271 if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
4320 f9b61e0fc929 run-tests.py: small cleanup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4319 diff changeset	272 cmd = '%s "%s"' % (python, testpath)
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	273 elif lctest.endswith('.bat'):
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	274 # 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	275 if os.name != 'nt':
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	276 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	277 return None
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	278 # 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	279 # the "cmd /c call" prefix is needed. Grrr
4320 f9b61e0fc929 run-tests.py: small cleanup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4319 diff changeset	280 cmd = 'cmd /c call "%s"' % testpath
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	281 else:
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	282 # 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	283 if os.name == 'nt':
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	284 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	285 return None
e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	286 # do not try to run non-executable programs
4320 f9b61e0fc929 run-tests.py: small cleanup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4319 diff changeset	287 if not os.access(testpath, os.X_OK):
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	288 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	289 return None
4320 f9b61e0fc929 run-tests.py: small cleanup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4319 diff changeset	290 cmd = '"%s"' % testpath
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	291
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	292 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	293 signal.alarm(options.timeout)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	294
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	295 vlog("# Running", cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	296 ret, out = run(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	297 vlog("# Ret was:", ret)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	298
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	299 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	300 signal.alarm(0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	301
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	302 skipped = (ret == SKIPPED_STATUS)
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	303 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	304 # 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	305 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	306 f = open(ref, "r")
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	307 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	308 f.close()
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	309 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	310 ref_out = []
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	311 if not skipped and out != ref_out:
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	312 diffret = 1
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	313 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	314 show_diff(ref_out, out)
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	315 if skipped:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	316 missing = extract_missing_features(out)
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	317 if not missing:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	318 missing = ['irrelevant']
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	319 print '\nSkipping %s: %s' % (test, missing[-1])
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	320 elif ret:
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	321 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	322 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	323 ret = diffret
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	324
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	325 if ret != 0 and not skipped:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	326 # 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	327 f = open(err, "wb")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	328 for line in out:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	329 f.write(line)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	330 f.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	331
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	332 # 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: 2570 diff changeset	333 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	334 fp = file(DAEMON_PIDS)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	335 for line in fp:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	336 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	337 pid = int(line)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	338 except ValueError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	339 continue
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	340 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	341 os.kill(pid, 0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	342 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: 2570 diff changeset	343 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: 2570 diff changeset	344 time.sleep(0.25)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	345 os.kill(pid, 0)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	346 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: 2570 diff changeset	347 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: 2570 diff changeset	348 except OSError, err:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	349 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: 2570 diff changeset	350 raise
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	351 fp.close()
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	352 os.unlink(DAEMON_PIDS)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	353 except IOError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	354 pass
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	355
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	356 os.chdir(TESTDIR)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	357 shutil.rmtree(tmpd, True)
4881 c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	358 if skipped:
c51c9bc4579d Add hghave utility and run-tests.py support. Patrick Mezard <pmezard@gmail.com> parents: 4880 diff changeset	359 return None
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	360 return ret == 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	361
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	362
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	363 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	364
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	365 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	366
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	367 # 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	368 # 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	369 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	370 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	371
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	372 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	373 HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	374 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
2989 3091b1153e2c Clear contents of global hgrc for tests before running each test. Thomas Arendsen Hein <thomas@intevation.de> parents: 2710 diff changeset	375 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	376
4365 46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	377 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
4387 93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4365 diff changeset	378 os.environ["HGMERGE"] = ('python "%s" -L my -L other'
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4365 diff changeset	379 % os.path.join(TESTDIR, os.path.pardir, 'contrib',
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4365 diff changeset	380 'simplemerge'))
4365 46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	381 os.environ["HGUSER"] = "test"
46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	382 os.environ["HGENCODING"] = "ascii"
46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	383 os.environ["HGENCODINGMODE"] = "strict"
46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4321 diff changeset	384
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	385 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	386 vlog("# Using HGTMP", HGTMP)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	387
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	388 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	389 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	390 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	391 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	392
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	393 try:
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	394 try:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	395 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	396
2571 83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	397 if options.timeout > 0:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	398 try:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	399 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: 2570 diff changeset	400 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: 2570 diff changeset	401 options.timeout)
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	402 except AttributeError:
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	403 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: 2570 diff changeset	404 options.timeout = 0
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2570 diff changeset	405
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	406 tested = 0
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	407 failed = 0
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	408 skipped = 0
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	409
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	410 if len(args) == 0:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	411 args = os.listdir(".")
3624 a90a86929d04 tests: sort test list if running all tests Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	412 args.sort()
a90a86929d04 tests: sort test list if running all tests Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	413
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	414
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	415 tests = []
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	416 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	417 if (test.startswith("test-") and '~' not in test and
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 2989 diff changeset	418 ('.' 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	419 test.endswith('.bat'))):
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	420 tests.append(test)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	421
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	422 if options.restart:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	423 orig = list(tests)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	424 while tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	425 if os.path.exists(tests[0] + ".err"):
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	426 break
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	427 tests.pop(0)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	428 if not tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	429 print "running all tests"
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	430 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	431
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	432 for test in tests:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	433 if options.retest and not os.path.exists(test + ".err"):
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	434 skipped += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	435 continue
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	436 ret = run_one(test)
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	437 if ret is None:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	438 skipped += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	439 elif not ret:
3626 02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	440 if options.interactive:
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	441 print "Accept this change? [n] ",
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	442 answer = sys.stdin.readline().strip()
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	443 if answer.lower() in "y yes".split():
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	444 os.rename(test + ".err", test + ".out")
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	445 tested += 1
02e9355c3420 tests: add -i switch Matt Mackall <mpm@selenic.com> parents: 3625 diff changeset	446 continue
3625 cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	447 failed += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	448 if options.first:
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	449 break
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	450 tested += 1
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	451
cc0cd5942223 tests: add -R switch Matt Mackall <mpm@selenic.com> parents: 3624 diff changeset	452 print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped,
2710 e475fe2a6029 run-tests.py: skip tests that should not run. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2705 diff changeset	453 failed)
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	454 if coverage:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	455 output_coverage()
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	456 except KeyboardInterrupt:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	457 failed = True
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	458 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	459 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	460 cleanup_exit()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	461
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	462 if failed:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	463 sys.exit(1)

Mercurial > public > mercurial-scm > hg-stable

annotate tests/run-tests.py @ 5078:d27ed83289ee