##// END OF EJS Templates
run-tests: self-test on Windows needs binary streams
Matt Mackall -
r22120:68a7ef43 stable
parent child Browse files
Show More
@@ -1,1823 +1,1832 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 #
2 #
3 # run-tests.py - Run a set of tests on Mercurial
3 # run-tests.py - Run a set of tests on Mercurial
4 #
4 #
5 # Copyright 2006 Matt Mackall <mpm@selenic.com>
5 # Copyright 2006 Matt Mackall <mpm@selenic.com>
6 #
6 #
7 # This software may be used and distributed according to the terms of the
7 # This software may be used and distributed according to the terms of the
8 # GNU General Public License version 2 or any later version.
8 # GNU General Public License version 2 or any later version.
9
9
10 # Modifying this script is tricky because it has many modes:
10 # Modifying this script is tricky because it has many modes:
11 # - serial (default) vs parallel (-jN, N > 1)
11 # - serial (default) vs parallel (-jN, N > 1)
12 # - no coverage (default) vs coverage (-c, -C, -s)
12 # - no coverage (default) vs coverage (-c, -C, -s)
13 # - temp install (default) vs specific hg script (--with-hg, --local)
13 # - temp install (default) vs specific hg script (--with-hg, --local)
14 # - tests are a mix of shell scripts and Python scripts
14 # - tests are a mix of shell scripts and Python scripts
15 #
15 #
16 # If you change this script, it is recommended that you ensure you
16 # If you change this script, it is recommended that you ensure you
17 # haven't broken it by running it in various modes with a representative
17 # haven't broken it by running it in various modes with a representative
18 # sample of test scripts. For example:
18 # sample of test scripts. For example:
19 #
19 #
20 # 1) serial, no coverage, temp install:
20 # 1) serial, no coverage, temp install:
21 # ./run-tests.py test-s*
21 # ./run-tests.py test-s*
22 # 2) serial, no coverage, local hg:
22 # 2) serial, no coverage, local hg:
23 # ./run-tests.py --local test-s*
23 # ./run-tests.py --local test-s*
24 # 3) serial, coverage, temp install:
24 # 3) serial, coverage, temp install:
25 # ./run-tests.py -c test-s*
25 # ./run-tests.py -c test-s*
26 # 4) serial, coverage, local hg:
26 # 4) serial, coverage, local hg:
27 # ./run-tests.py -c --local test-s* # unsupported
27 # ./run-tests.py -c --local test-s* # unsupported
28 # 5) parallel, no coverage, temp install:
28 # 5) parallel, no coverage, temp install:
29 # ./run-tests.py -j2 test-s*
29 # ./run-tests.py -j2 test-s*
30 # 6) parallel, no coverage, local hg:
30 # 6) parallel, no coverage, local hg:
31 # ./run-tests.py -j2 --local test-s*
31 # ./run-tests.py -j2 --local test-s*
32 # 7) parallel, coverage, temp install:
32 # 7) parallel, coverage, temp install:
33 # ./run-tests.py -j2 -c test-s* # currently broken
33 # ./run-tests.py -j2 -c test-s* # currently broken
34 # 8) parallel, coverage, local install:
34 # 8) parallel, coverage, local install:
35 # ./run-tests.py -j2 -c --local test-s* # unsupported (and broken)
35 # ./run-tests.py -j2 -c --local test-s* # unsupported (and broken)
36 # 9) parallel, custom tmp dir:
36 # 9) parallel, custom tmp dir:
37 # ./run-tests.py -j2 --tmpdir /tmp/myhgtests
37 # ./run-tests.py -j2 --tmpdir /tmp/myhgtests
38 #
38 #
39 # (You could use any subset of the tests: test-s* happens to match
39 # (You could use any subset of the tests: test-s* happens to match
40 # enough that it's worth doing parallel runs, few enough that it
40 # enough that it's worth doing parallel runs, few enough that it
41 # completes fairly quickly, includes both shell and Python scripts, and
41 # completes fairly quickly, includes both shell and Python scripts, and
42 # includes some scripts that run daemon processes.)
42 # includes some scripts that run daemon processes.)
43
43
44 from distutils import version
44 from distutils import version
45 import difflib
45 import difflib
46 import errno
46 import errno
47 import optparse
47 import optparse
48 import os
48 import os
49 import shutil
49 import shutil
50 import subprocess
50 import subprocess
51 import signal
51 import signal
52 import sys
52 import sys
53 import tempfile
53 import tempfile
54 import time
54 import time
55 import random
55 import random
56 import re
56 import re
57 import threading
57 import threading
58 import killdaemons as killmod
58 import killdaemons as killmod
59 import Queue as queue
59 import Queue as queue
60 import unittest
60 import unittest
61
61
62 processlock = threading.Lock()
62 processlock = threading.Lock()
63
63
64 # subprocess._cleanup can race with any Popen.wait or Popen.poll on py24
64 # subprocess._cleanup can race with any Popen.wait or Popen.poll on py24
65 # http://bugs.python.org/issue1731717 for details. We shouldn't be producing
65 # http://bugs.python.org/issue1731717 for details. We shouldn't be producing
66 # zombies but it's pretty harmless even if we do.
66 # zombies but it's pretty harmless even if we do.
67 if sys.version_info < (2, 5):
67 if sys.version_info < (2, 5):
68 subprocess._cleanup = lambda: None
68 subprocess._cleanup = lambda: None
69
69
70 closefds = os.name == 'posix'
70 closefds = os.name == 'posix'
71 def Popen4(cmd, wd, timeout, env=None):
71 def Popen4(cmd, wd, timeout, env=None):
72 processlock.acquire()
72 processlock.acquire()
73 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
73 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
74 close_fds=closefds,
74 close_fds=closefds,
75 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
75 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
76 stderr=subprocess.STDOUT)
76 stderr=subprocess.STDOUT)
77 processlock.release()
77 processlock.release()
78
78
79 p.fromchild = p.stdout
79 p.fromchild = p.stdout
80 p.tochild = p.stdin
80 p.tochild = p.stdin
81 p.childerr = p.stderr
81 p.childerr = p.stderr
82
82
83 p.timeout = False
83 p.timeout = False
84 if timeout:
84 if timeout:
85 def t():
85 def t():
86 start = time.time()
86 start = time.time()
87 while time.time() - start < timeout and p.returncode is None:
87 while time.time() - start < timeout and p.returncode is None:
88 time.sleep(.1)
88 time.sleep(.1)
89 p.timeout = True
89 p.timeout = True
90 if p.returncode is None:
90 if p.returncode is None:
91 terminate(p)
91 terminate(p)
92 threading.Thread(target=t).start()
92 threading.Thread(target=t).start()
93
93
94 return p
94 return p
95
95
96 PYTHON = sys.executable.replace('\\', '/')
96 PYTHON = sys.executable.replace('\\', '/')
97 IMPL_PATH = 'PYTHONPATH'
97 IMPL_PATH = 'PYTHONPATH'
98 if 'java' in sys.platform:
98 if 'java' in sys.platform:
99 IMPL_PATH = 'JYTHONPATH'
99 IMPL_PATH = 'JYTHONPATH'
100
100
101 TESTDIR = HGTMP = INST = BINDIR = TMPBINDIR = PYTHONDIR = None
101 TESTDIR = HGTMP = INST = BINDIR = TMPBINDIR = PYTHONDIR = None
102
102
103 defaults = {
103 defaults = {
104 'jobs': ('HGTEST_JOBS', 1),
104 'jobs': ('HGTEST_JOBS', 1),
105 'timeout': ('HGTEST_TIMEOUT', 180),
105 'timeout': ('HGTEST_TIMEOUT', 180),
106 'port': ('HGTEST_PORT', 20059),
106 'port': ('HGTEST_PORT', 20059),
107 'shell': ('HGTEST_SHELL', 'sh'),
107 'shell': ('HGTEST_SHELL', 'sh'),
108 }
108 }
109
109
110 def parselistfiles(files, listtype, warn=True):
110 def parselistfiles(files, listtype, warn=True):
111 entries = dict()
111 entries = dict()
112 for filename in files:
112 for filename in files:
113 try:
113 try:
114 path = os.path.expanduser(os.path.expandvars(filename))
114 path = os.path.expanduser(os.path.expandvars(filename))
115 f = open(path, "rb")
115 f = open(path, "rb")
116 except IOError, err:
116 except IOError, err:
117 if err.errno != errno.ENOENT:
117 if err.errno != errno.ENOENT:
118 raise
118 raise
119 if warn:
119 if warn:
120 print "warning: no such %s file: %s" % (listtype, filename)
120 print "warning: no such %s file: %s" % (listtype, filename)
121 continue
121 continue
122
122
123 for line in f.readlines():
123 for line in f.readlines():
124 line = line.split('#', 1)[0].strip()
124 line = line.split('#', 1)[0].strip()
125 if line:
125 if line:
126 entries[line] = filename
126 entries[line] = filename
127
127
128 f.close()
128 f.close()
129 return entries
129 return entries
130
130
131 def getparser():
131 def getparser():
132 """Obtain the OptionParser used by the CLI."""
132 """Obtain the OptionParser used by the CLI."""
133 parser = optparse.OptionParser("%prog [options] [tests]")
133 parser = optparse.OptionParser("%prog [options] [tests]")
134
134
135 # keep these sorted
135 # keep these sorted
136 parser.add_option("--blacklist", action="append",
136 parser.add_option("--blacklist", action="append",
137 help="skip tests listed in the specified blacklist file")
137 help="skip tests listed in the specified blacklist file")
138 parser.add_option("--whitelist", action="append",
138 parser.add_option("--whitelist", action="append",
139 help="always run tests listed in the specified whitelist file")
139 help="always run tests listed in the specified whitelist file")
140 parser.add_option("--changed", type="string",
140 parser.add_option("--changed", type="string",
141 help="run tests that are changed in parent rev or working directory")
141 help="run tests that are changed in parent rev or working directory")
142 parser.add_option("-C", "--annotate", action="store_true",
142 parser.add_option("-C", "--annotate", action="store_true",
143 help="output files annotated with coverage")
143 help="output files annotated with coverage")
144 parser.add_option("-c", "--cover", action="store_true",
144 parser.add_option("-c", "--cover", action="store_true",
145 help="print a test coverage report")
145 help="print a test coverage report")
146 parser.add_option("-d", "--debug", action="store_true",
146 parser.add_option("-d", "--debug", action="store_true",
147 help="debug mode: write output of test scripts to console"
147 help="debug mode: write output of test scripts to console"
148 " rather than capturing and diffing it (disables timeout)")
148 " rather than capturing and diffing it (disables timeout)")
149 parser.add_option("-f", "--first", action="store_true",
149 parser.add_option("-f", "--first", action="store_true",
150 help="exit on the first test failure")
150 help="exit on the first test failure")
151 parser.add_option("-H", "--htmlcov", action="store_true",
151 parser.add_option("-H", "--htmlcov", action="store_true",
152 help="create an HTML report of the coverage of the files")
152 help="create an HTML report of the coverage of the files")
153 parser.add_option("-i", "--interactive", action="store_true",
153 parser.add_option("-i", "--interactive", action="store_true",
154 help="prompt to accept changed output")
154 help="prompt to accept changed output")
155 parser.add_option("-j", "--jobs", type="int",
155 parser.add_option("-j", "--jobs", type="int",
156 help="number of jobs to run in parallel"
156 help="number of jobs to run in parallel"
157 " (default: $%s or %d)" % defaults['jobs'])
157 " (default: $%s or %d)" % defaults['jobs'])
158 parser.add_option("--keep-tmpdir", action="store_true",
158 parser.add_option("--keep-tmpdir", action="store_true",
159 help="keep temporary directory after running tests")
159 help="keep temporary directory after running tests")
160 parser.add_option("-k", "--keywords",
160 parser.add_option("-k", "--keywords",
161 help="run tests matching keywords")
161 help="run tests matching keywords")
162 parser.add_option("-l", "--local", action="store_true",
162 parser.add_option("-l", "--local", action="store_true",
163 help="shortcut for --with-hg=<testdir>/../hg")
163 help="shortcut for --with-hg=<testdir>/../hg")
164 parser.add_option("--loop", action="store_true",
164 parser.add_option("--loop", action="store_true",
165 help="loop tests repeatedly")
165 help="loop tests repeatedly")
166 parser.add_option("-n", "--nodiff", action="store_true",
166 parser.add_option("-n", "--nodiff", action="store_true",
167 help="skip showing test changes")
167 help="skip showing test changes")
168 parser.add_option("-p", "--port", type="int",
168 parser.add_option("-p", "--port", type="int",
169 help="port on which servers should listen"
169 help="port on which servers should listen"
170 " (default: $%s or %d)" % defaults['port'])
170 " (default: $%s or %d)" % defaults['port'])
171 parser.add_option("--compiler", type="string",
171 parser.add_option("--compiler", type="string",
172 help="compiler to build with")
172 help="compiler to build with")
173 parser.add_option("--pure", action="store_true",
173 parser.add_option("--pure", action="store_true",
174 help="use pure Python code instead of C extensions")
174 help="use pure Python code instead of C extensions")
175 parser.add_option("-R", "--restart", action="store_true",
175 parser.add_option("-R", "--restart", action="store_true",
176 help="restart at last error")
176 help="restart at last error")
177 parser.add_option("-r", "--retest", action="store_true",
177 parser.add_option("-r", "--retest", action="store_true",
178 help="retest failed tests")
178 help="retest failed tests")
179 parser.add_option("-S", "--noskips", action="store_true",
179 parser.add_option("-S", "--noskips", action="store_true",
180 help="don't report skip tests verbosely")
180 help="don't report skip tests verbosely")
181 parser.add_option("--shell", type="string",
181 parser.add_option("--shell", type="string",
182 help="shell to use (default: $%s or %s)" % defaults['shell'])
182 help="shell to use (default: $%s or %s)" % defaults['shell'])
183 parser.add_option("-t", "--timeout", type="int",
183 parser.add_option("-t", "--timeout", type="int",
184 help="kill errant tests after TIMEOUT seconds"
184 help="kill errant tests after TIMEOUT seconds"
185 " (default: $%s or %d)" % defaults['timeout'])
185 " (default: $%s or %d)" % defaults['timeout'])
186 parser.add_option("--time", action="store_true",
186 parser.add_option("--time", action="store_true",
187 help="time how long each test takes")
187 help="time how long each test takes")
188 parser.add_option("--tmpdir", type="string",
188 parser.add_option("--tmpdir", type="string",
189 help="run tests in the given temporary directory"
189 help="run tests in the given temporary directory"
190 " (implies --keep-tmpdir)")
190 " (implies --keep-tmpdir)")
191 parser.add_option("-v", "--verbose", action="store_true",
191 parser.add_option("-v", "--verbose", action="store_true",
192 help="output verbose messages")
192 help="output verbose messages")
193 parser.add_option("--view", type="string",
193 parser.add_option("--view", type="string",
194 help="external diff viewer")
194 help="external diff viewer")
195 parser.add_option("--with-hg", type="string",
195 parser.add_option("--with-hg", type="string",
196 metavar="HG",
196 metavar="HG",
197 help="test using specified hg script rather than a "
197 help="test using specified hg script rather than a "
198 "temporary installation")
198 "temporary installation")
199 parser.add_option("-3", "--py3k-warnings", action="store_true",
199 parser.add_option("-3", "--py3k-warnings", action="store_true",
200 help="enable Py3k warnings on Python 2.6+")
200 help="enable Py3k warnings on Python 2.6+")
201 parser.add_option('--extra-config-opt', action="append",
201 parser.add_option('--extra-config-opt', action="append",
202 help='set the given config opt in the test hgrc')
202 help='set the given config opt in the test hgrc')
203 parser.add_option('--random', action="store_true",
203 parser.add_option('--random', action="store_true",
204 help='run tests in random order')
204 help='run tests in random order')
205
205
206 for option, (envvar, default) in defaults.items():
206 for option, (envvar, default) in defaults.items():
207 defaults[option] = type(default)(os.environ.get(envvar, default))
207 defaults[option] = type(default)(os.environ.get(envvar, default))
208 parser.set_defaults(**defaults)
208 parser.set_defaults(**defaults)
209
209
210 return parser
210 return parser
211
211
212 def parseargs(args, parser):
212 def parseargs(args, parser):
213 """Parse arguments with our OptionParser and validate results."""
213 """Parse arguments with our OptionParser and validate results."""
214 (options, args) = parser.parse_args(args)
214 (options, args) = parser.parse_args(args)
215
215
216 # jython is always pure
216 # jython is always pure
217 if 'java' in sys.platform or '__pypy__' in sys.modules:
217 if 'java' in sys.platform or '__pypy__' in sys.modules:
218 options.pure = True
218 options.pure = True
219
219
220 if options.with_hg:
220 if options.with_hg:
221 options.with_hg = os.path.expanduser(options.with_hg)
221 options.with_hg = os.path.expanduser(options.with_hg)
222 if not (os.path.isfile(options.with_hg) and
222 if not (os.path.isfile(options.with_hg) and
223 os.access(options.with_hg, os.X_OK)):
223 os.access(options.with_hg, os.X_OK)):
224 parser.error('--with-hg must specify an executable hg script')
224 parser.error('--with-hg must specify an executable hg script')
225 if not os.path.basename(options.with_hg) == 'hg':
225 if not os.path.basename(options.with_hg) == 'hg':
226 sys.stderr.write('warning: --with-hg should specify an hg script\n')
226 sys.stderr.write('warning: --with-hg should specify an hg script\n')
227 if options.local:
227 if options.local:
228 testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
228 testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
229 hgbin = os.path.join(os.path.dirname(testdir), 'hg')
229 hgbin = os.path.join(os.path.dirname(testdir), 'hg')
230 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
230 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
231 parser.error('--local specified, but %r not found or not executable'
231 parser.error('--local specified, but %r not found or not executable'
232 % hgbin)
232 % hgbin)
233 options.with_hg = hgbin
233 options.with_hg = hgbin
234
234
235 options.anycoverage = options.cover or options.annotate or options.htmlcov
235 options.anycoverage = options.cover or options.annotate or options.htmlcov
236 if options.anycoverage:
236 if options.anycoverage:
237 try:
237 try:
238 import coverage
238 import coverage
239 covver = version.StrictVersion(coverage.__version__).version
239 covver = version.StrictVersion(coverage.__version__).version
240 if covver < (3, 3):
240 if covver < (3, 3):
241 parser.error('coverage options require coverage 3.3 or later')
241 parser.error('coverage options require coverage 3.3 or later')
242 except ImportError:
242 except ImportError:
243 parser.error('coverage options now require the coverage package')
243 parser.error('coverage options now require the coverage package')
244
244
245 if options.anycoverage and options.local:
245 if options.anycoverage and options.local:
246 # this needs some path mangling somewhere, I guess
246 # this needs some path mangling somewhere, I guess
247 parser.error("sorry, coverage options do not work when --local "
247 parser.error("sorry, coverage options do not work when --local "
248 "is specified")
248 "is specified")
249
249
250 global verbose
250 global verbose
251 if options.verbose:
251 if options.verbose:
252 verbose = ''
252 verbose = ''
253
253
254 if options.tmpdir:
254 if options.tmpdir:
255 options.tmpdir = os.path.expanduser(options.tmpdir)
255 options.tmpdir = os.path.expanduser(options.tmpdir)
256
256
257 if options.jobs < 1:
257 if options.jobs < 1:
258 parser.error('--jobs must be positive')
258 parser.error('--jobs must be positive')
259 if options.interactive and options.debug:
259 if options.interactive and options.debug:
260 parser.error("-i/--interactive and -d/--debug are incompatible")
260 parser.error("-i/--interactive and -d/--debug are incompatible")
261 if options.debug:
261 if options.debug:
262 if options.timeout != defaults['timeout']:
262 if options.timeout != defaults['timeout']:
263 sys.stderr.write(
263 sys.stderr.write(
264 'warning: --timeout option ignored with --debug\n')
264 'warning: --timeout option ignored with --debug\n')
265 options.timeout = 0
265 options.timeout = 0
266 if options.py3k_warnings:
266 if options.py3k_warnings:
267 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
267 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
268 parser.error('--py3k-warnings can only be used on Python 2.6+')
268 parser.error('--py3k-warnings can only be used on Python 2.6+')
269 if options.blacklist:
269 if options.blacklist:
270 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
270 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
271 if options.whitelist:
271 if options.whitelist:
272 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
272 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
273 else:
273 else:
274 options.whitelisted = {}
274 options.whitelisted = {}
275
275
276 return (options, args)
276 return (options, args)
277
277
278 def rename(src, dst):
278 def rename(src, dst):
279 """Like os.rename(), trade atomicity and opened files friendliness
279 """Like os.rename(), trade atomicity and opened files friendliness
280 for existing destination support.
280 for existing destination support.
281 """
281 """
282 shutil.copy(src, dst)
282 shutil.copy(src, dst)
283 os.remove(src)
283 os.remove(src)
284
284
285 def getdiff(expected, output, ref, err):
285 def getdiff(expected, output, ref, err):
286 servefail = False
286 servefail = False
287 lines = []
287 lines = []
288 for line in difflib.unified_diff(expected, output, ref, err):
288 for line in difflib.unified_diff(expected, output, ref, err):
289 if line.startswith('+++') or line.startswith('---'):
289 if line.startswith('+++') or line.startswith('---'):
290 if line.endswith(' \n'):
290 if line.endswith(' \n'):
291 line = line[:-2] + '\n'
291 line = line[:-2] + '\n'
292 lines.append(line)
292 lines.append(line)
293 if not servefail and line.startswith(
293 if not servefail and line.startswith(
294 '+ abort: child process failed to start'):
294 '+ abort: child process failed to start'):
295 servefail = True
295 servefail = True
296
296
297 return servefail, lines
297 return servefail, lines
298
298
299 verbose = False
299 verbose = False
300 def vlog(*msg):
300 def vlog(*msg):
301 """Log only when in verbose mode."""
301 """Log only when in verbose mode."""
302 if verbose is False:
302 if verbose is False:
303 return
303 return
304
304
305 return log(*msg)
305 return log(*msg)
306
306
307 def log(*msg):
307 def log(*msg):
308 """Log something to stdout.
308 """Log something to stdout.
309
309
310 Arguments are strings to print.
310 Arguments are strings to print.
311 """
311 """
312 iolock.acquire()
312 iolock.acquire()
313 if verbose:
313 if verbose:
314 print verbose,
314 print verbose,
315 for m in msg:
315 for m in msg:
316 print m,
316 print m,
317 print
317 print
318 sys.stdout.flush()
318 sys.stdout.flush()
319 iolock.release()
319 iolock.release()
320
320
321 def terminate(proc):
321 def terminate(proc):
322 """Terminate subprocess (with fallback for Python versions < 2.6)"""
322 """Terminate subprocess (with fallback for Python versions < 2.6)"""
323 vlog('# Terminating process %d' % proc.pid)
323 vlog('# Terminating process %d' % proc.pid)
324 try:
324 try:
325 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
325 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
326 except OSError:
326 except OSError:
327 pass
327 pass
328
328
329 def killdaemons(pidfile):
329 def killdaemons(pidfile):
330 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
330 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
331 logfn=vlog)
331 logfn=vlog)
332
332
333 class Test(unittest.TestCase):
333 class Test(unittest.TestCase):
334 """Encapsulates a single, runnable test.
334 """Encapsulates a single, runnable test.
335
335
336 While this class conforms to the unittest.TestCase API, it differs in that
336 While this class conforms to the unittest.TestCase API, it differs in that
337 instances need to be instantiated manually. (Typically, unittest.TestCase
337 instances need to be instantiated manually. (Typically, unittest.TestCase
338 classes are instantiated automatically by scanning modules.)
338 classes are instantiated automatically by scanning modules.)
339 """
339 """
340
340
341 # Status code reserved for skipped tests (used by hghave).
341 # Status code reserved for skipped tests (used by hghave).
342 SKIPPED_STATUS = 80
342 SKIPPED_STATUS = 80
343
343
344 def __init__(self, path, tmpdir, keeptmpdir=False,
344 def __init__(self, path, tmpdir, keeptmpdir=False,
345 debug=False,
345 debug=False,
346 timeout=defaults['timeout'],
346 timeout=defaults['timeout'],
347 startport=defaults['port'], extraconfigopts=None,
347 startport=defaults['port'], extraconfigopts=None,
348 py3kwarnings=False, shell=None):
348 py3kwarnings=False, shell=None):
349 """Create a test from parameters.
349 """Create a test from parameters.
350
350
351 path is the full path to the file defining the test.
351 path is the full path to the file defining the test.
352
352
353 tmpdir is the main temporary directory to use for this test.
353 tmpdir is the main temporary directory to use for this test.
354
354
355 keeptmpdir determines whether to keep the test's temporary directory
355 keeptmpdir determines whether to keep the test's temporary directory
356 after execution. It defaults to removal (False).
356 after execution. It defaults to removal (False).
357
357
358 debug mode will make the test execute verbosely, with unfiltered
358 debug mode will make the test execute verbosely, with unfiltered
359 output.
359 output.
360
360
361 timeout controls the maximum run time of the test. It is ignored when
361 timeout controls the maximum run time of the test. It is ignored when
362 debug is True.
362 debug is True.
363
363
364 startport controls the starting port number to use for this test. Each
364 startport controls the starting port number to use for this test. Each
365 test will reserve 3 port numbers for execution. It is the caller's
365 test will reserve 3 port numbers for execution. It is the caller's
366 responsibility to allocate a non-overlapping port range to Test
366 responsibility to allocate a non-overlapping port range to Test
367 instances.
367 instances.
368
368
369 extraconfigopts is an iterable of extra hgrc config options. Values
369 extraconfigopts is an iterable of extra hgrc config options. Values
370 must have the form "key=value" (something understood by hgrc). Values
370 must have the form "key=value" (something understood by hgrc). Values
371 of the form "foo.key=value" will result in "[foo] key=value".
371 of the form "foo.key=value" will result in "[foo] key=value".
372
372
373 py3kwarnings enables Py3k warnings.
373 py3kwarnings enables Py3k warnings.
374
374
375 shell is the shell to execute tests in.
375 shell is the shell to execute tests in.
376 """
376 """
377
377
378 self.path = path
378 self.path = path
379 self.name = os.path.basename(path)
379 self.name = os.path.basename(path)
380 self._testdir = os.path.dirname(path)
380 self._testdir = os.path.dirname(path)
381 self.errpath = os.path.join(self._testdir, '%s.err' % self.name)
381 self.errpath = os.path.join(self._testdir, '%s.err' % self.name)
382
382
383 self._threadtmp = tmpdir
383 self._threadtmp = tmpdir
384 self._keeptmpdir = keeptmpdir
384 self._keeptmpdir = keeptmpdir
385 self._debug = debug
385 self._debug = debug
386 self._timeout = timeout
386 self._timeout = timeout
387 self._startport = startport
387 self._startport = startport
388 self._extraconfigopts = extraconfigopts or []
388 self._extraconfigopts = extraconfigopts or []
389 self._py3kwarnings = py3kwarnings
389 self._py3kwarnings = py3kwarnings
390 self._shell = shell
390 self._shell = shell
391
391
392 self._aborted = False
392 self._aborted = False
393 self._daemonpids = []
393 self._daemonpids = []
394 self._finished = None
394 self._finished = None
395 self._ret = None
395 self._ret = None
396 self._out = None
396 self._out = None
397 self._skipped = None
397 self._skipped = None
398 self._testtmp = None
398 self._testtmp = None
399
399
400 # If we're not in --debug mode and reference output file exists,
400 # If we're not in --debug mode and reference output file exists,
401 # check test output against it.
401 # check test output against it.
402 if debug:
402 if debug:
403 self._refout = None # to match "out is None"
403 self._refout = None # to match "out is None"
404 elif os.path.exists(self.refpath):
404 elif os.path.exists(self.refpath):
405 f = open(self.refpath, 'rb')
405 f = open(self.refpath, 'rb')
406 self._refout = f.read().splitlines(True)
406 self._refout = f.read().splitlines(True)
407 f.close()
407 f.close()
408 else:
408 else:
409 self._refout = []
409 self._refout = []
410
410
411 def __str__(self):
411 def __str__(self):
412 return self.name
412 return self.name
413
413
414 def shortDescription(self):
414 def shortDescription(self):
415 return self.name
415 return self.name
416
416
417 def setUp(self):
417 def setUp(self):
418 """Tasks to perform before run()."""
418 """Tasks to perform before run()."""
419 self._finished = False
419 self._finished = False
420 self._ret = None
420 self._ret = None
421 self._out = None
421 self._out = None
422 self._skipped = None
422 self._skipped = None
423
423
424 try:
424 try:
425 os.mkdir(self._threadtmp)
425 os.mkdir(self._threadtmp)
426 except OSError, e:
426 except OSError, e:
427 if e.errno != errno.EEXIST:
427 if e.errno != errno.EEXIST:
428 raise
428 raise
429
429
430 self._testtmp = os.path.join(self._threadtmp,
430 self._testtmp = os.path.join(self._threadtmp,
431 os.path.basename(self.path))
431 os.path.basename(self.path))
432 os.mkdir(self._testtmp)
432 os.mkdir(self._testtmp)
433
433
434 # Remove any previous output files.
434 # Remove any previous output files.
435 if os.path.exists(self.errpath):
435 if os.path.exists(self.errpath):
436 os.remove(self.errpath)
436 os.remove(self.errpath)
437
437
438 def run(self, result):
438 def run(self, result):
439 """Run this test and report results against a TestResult instance."""
439 """Run this test and report results against a TestResult instance."""
440 # This function is extremely similar to unittest.TestCase.run(). Once
440 # This function is extremely similar to unittest.TestCase.run(). Once
441 # we require Python 2.7 (or at least its version of unittest), this
441 # we require Python 2.7 (or at least its version of unittest), this
442 # function can largely go away.
442 # function can largely go away.
443 self._result = result
443 self._result = result
444 result.startTest(self)
444 result.startTest(self)
445 try:
445 try:
446 try:
446 try:
447 self.setUp()
447 self.setUp()
448 except (KeyboardInterrupt, SystemExit):
448 except (KeyboardInterrupt, SystemExit):
449 self._aborted = True
449 self._aborted = True
450 raise
450 raise
451 except Exception:
451 except Exception:
452 result.addError(self, sys.exc_info())
452 result.addError(self, sys.exc_info())
453 return
453 return
454
454
455 success = False
455 success = False
456 try:
456 try:
457 self.runTest()
457 self.runTest()
458 except KeyboardInterrupt:
458 except KeyboardInterrupt:
459 self._aborted = True
459 self._aborted = True
460 raise
460 raise
461 except SkipTest, e:
461 except SkipTest, e:
462 result.addSkip(self, str(e))
462 result.addSkip(self, str(e))
463 except IgnoreTest, e:
463 except IgnoreTest, e:
464 result.addIgnore(self, str(e))
464 result.addIgnore(self, str(e))
465 except WarnTest, e:
465 except WarnTest, e:
466 result.addWarn(self, str(e))
466 result.addWarn(self, str(e))
467 except self.failureException, e:
467 except self.failureException, e:
468 # This differs from unittest in that we don't capture
468 # This differs from unittest in that we don't capture
469 # the stack trace. This is for historical reasons and
469 # the stack trace. This is for historical reasons and
470 # this decision could be revisted in the future,
470 # this decision could be revisted in the future,
471 # especially for PythonTest instances.
471 # especially for PythonTest instances.
472 if result.addFailure(self, str(e)):
472 if result.addFailure(self, str(e)):
473 success = True
473 success = True
474 except Exception:
474 except Exception:
475 result.addError(self, sys.exc_info())
475 result.addError(self, sys.exc_info())
476 else:
476 else:
477 success = True
477 success = True
478
478
479 try:
479 try:
480 self.tearDown()
480 self.tearDown()
481 except (KeyboardInterrupt, SystemExit):
481 except (KeyboardInterrupt, SystemExit):
482 self._aborted = True
482 self._aborted = True
483 raise
483 raise
484 except Exception:
484 except Exception:
485 result.addError(self, sys.exc_info())
485 result.addError(self, sys.exc_info())
486 success = False
486 success = False
487
487
488 if success:
488 if success:
489 result.addSuccess(self)
489 result.addSuccess(self)
490 finally:
490 finally:
491 result.stopTest(self, interrupted=self._aborted)
491 result.stopTest(self, interrupted=self._aborted)
492
492
493 def runTest(self):
493 def runTest(self):
494 """Run this test instance.
494 """Run this test instance.
495
495
496 This will return a tuple describing the result of the test.
496 This will return a tuple describing the result of the test.
497 """
497 """
498 replacements = self._getreplacements()
498 replacements = self._getreplacements()
499 env = self._getenv()
499 env = self._getenv()
500 self._daemonpids.append(env['DAEMON_PIDS'])
500 self._daemonpids.append(env['DAEMON_PIDS'])
501 self._createhgrc(env['HGRCPATH'])
501 self._createhgrc(env['HGRCPATH'])
502
502
503 vlog('# Test', self.name)
503 vlog('# Test', self.name)
504
504
505 ret, out = self._run(replacements, env)
505 ret, out = self._run(replacements, env)
506 self._finished = True
506 self._finished = True
507 self._ret = ret
507 self._ret = ret
508 self._out = out
508 self._out = out
509
509
510 def describe(ret):
510 def describe(ret):
511 if ret < 0:
511 if ret < 0:
512 return 'killed by signal: %d' % -ret
512 return 'killed by signal: %d' % -ret
513 return 'returned error code %d' % ret
513 return 'returned error code %d' % ret
514
514
515 self._skipped = False
515 self._skipped = False
516
516
517 if ret == self.SKIPPED_STATUS:
517 if ret == self.SKIPPED_STATUS:
518 if out is None: # Debug mode, nothing to parse.
518 if out is None: # Debug mode, nothing to parse.
519 missing = ['unknown']
519 missing = ['unknown']
520 failed = None
520 failed = None
521 else:
521 else:
522 missing, failed = TTest.parsehghaveoutput(out)
522 missing, failed = TTest.parsehghaveoutput(out)
523
523
524 if not missing:
524 if not missing:
525 missing = ['irrelevant']
525 missing = ['irrelevant']
526
526
527 if failed:
527 if failed:
528 self.fail('hg have failed checking for %s' % failed[-1])
528 self.fail('hg have failed checking for %s' % failed[-1])
529 else:
529 else:
530 self._skipped = True
530 self._skipped = True
531 raise SkipTest(missing[-1])
531 raise SkipTest(missing[-1])
532 elif ret == 'timeout':
532 elif ret == 'timeout':
533 self.fail('timed out')
533 self.fail('timed out')
534 elif ret is False:
534 elif ret is False:
535 raise WarnTest('no result code from test')
535 raise WarnTest('no result code from test')
536 elif out != self._refout:
536 elif out != self._refout:
537 # Diff generation may rely on written .err file.
537 # Diff generation may rely on written .err file.
538 if (ret != 0 or out != self._refout) and not self._skipped \
538 if (ret != 0 or out != self._refout) and not self._skipped \
539 and not self._debug:
539 and not self._debug:
540 f = open(self.errpath, 'wb')
540 f = open(self.errpath, 'wb')
541 for line in out:
541 for line in out:
542 f.write(line)
542 f.write(line)
543 f.close()
543 f.close()
544
544
545 # The result object handles diff calculation for us.
545 # The result object handles diff calculation for us.
546 if self._result.addOutputMismatch(self, ret, out, self._refout):
546 if self._result.addOutputMismatch(self, ret, out, self._refout):
547 # change was accepted, skip failing
547 # change was accepted, skip failing
548 return
548 return
549
549
550 if ret:
550 if ret:
551 msg = 'output changed and ' + describe(ret)
551 msg = 'output changed and ' + describe(ret)
552 else:
552 else:
553 msg = 'output changed'
553 msg = 'output changed'
554
554
555 self.fail(msg)
555 self.fail(msg)
556 elif ret:
556 elif ret:
557 self.fail(describe(ret))
557 self.fail(describe(ret))
558
558
559 def tearDown(self):
559 def tearDown(self):
560 """Tasks to perform after run()."""
560 """Tasks to perform after run()."""
561 for entry in self._daemonpids:
561 for entry in self._daemonpids:
562 killdaemons(entry)
562 killdaemons(entry)
563 self._daemonpids = []
563 self._daemonpids = []
564
564
565 if not self._keeptmpdir:
565 if not self._keeptmpdir:
566 shutil.rmtree(self._testtmp, True)
566 shutil.rmtree(self._testtmp, True)
567 shutil.rmtree(self._threadtmp, True)
567 shutil.rmtree(self._threadtmp, True)
568
568
569 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
569 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
570 and not self._debug and self._out:
570 and not self._debug and self._out:
571 f = open(self.errpath, 'wb')
571 f = open(self.errpath, 'wb')
572 for line in self._out:
572 for line in self._out:
573 f.write(line)
573 f.write(line)
574 f.close()
574 f.close()
575
575
576 vlog("# Ret was:", self._ret)
576 vlog("# Ret was:", self._ret)
577
577
578 def _run(self, replacements, env):
578 def _run(self, replacements, env):
579 # This should be implemented in child classes to run tests.
579 # This should be implemented in child classes to run tests.
580 raise SkipTest('unknown test type')
580 raise SkipTest('unknown test type')
581
581
582 def abort(self):
582 def abort(self):
583 """Terminate execution of this test."""
583 """Terminate execution of this test."""
584 self._aborted = True
584 self._aborted = True
585
585
586 def _getreplacements(self):
586 def _getreplacements(self):
587 """Obtain a mapping of text replacements to apply to test output.
587 """Obtain a mapping of text replacements to apply to test output.
588
588
589 Test output needs to be normalized so it can be compared to expected
589 Test output needs to be normalized so it can be compared to expected
590 output. This function defines how some of that normalization will
590 output. This function defines how some of that normalization will
591 occur.
591 occur.
592 """
592 """
593 r = [
593 r = [
594 (r':%s\b' % self._startport, ':$HGPORT'),
594 (r':%s\b' % self._startport, ':$HGPORT'),
595 (r':%s\b' % (self._startport + 1), ':$HGPORT1'),
595 (r':%s\b' % (self._startport + 1), ':$HGPORT1'),
596 (r':%s\b' % (self._startport + 2), ':$HGPORT2'),
596 (r':%s\b' % (self._startport + 2), ':$HGPORT2'),
597 ]
597 ]
598
598
599 if os.name == 'nt':
599 if os.name == 'nt':
600 r.append(
600 r.append(
601 (''.join(c.isalpha() and '[%s%s]' % (c.lower(), c.upper()) or
601 (''.join(c.isalpha() and '[%s%s]' % (c.lower(), c.upper()) or
602 c in '/\\' and r'[/\\]' or c.isdigit() and c or '\\' + c
602 c in '/\\' and r'[/\\]' or c.isdigit() and c or '\\' + c
603 for c in self._testtmp), '$TESTTMP'))
603 for c in self._testtmp), '$TESTTMP'))
604 else:
604 else:
605 r.append((re.escape(self._testtmp), '$TESTTMP'))
605 r.append((re.escape(self._testtmp), '$TESTTMP'))
606
606
607 return r
607 return r
608
608
609 def _getenv(self):
609 def _getenv(self):
610 """Obtain environment variables to use during test execution."""
610 """Obtain environment variables to use during test execution."""
611 env = os.environ.copy()
611 env = os.environ.copy()
612 env['TESTTMP'] = self._testtmp
612 env['TESTTMP'] = self._testtmp
613 env['HOME'] = self._testtmp
613 env['HOME'] = self._testtmp
614 env["HGPORT"] = str(self._startport)
614 env["HGPORT"] = str(self._startport)
615 env["HGPORT1"] = str(self._startport + 1)
615 env["HGPORT1"] = str(self._startport + 1)
616 env["HGPORT2"] = str(self._startport + 2)
616 env["HGPORT2"] = str(self._startport + 2)
617 env["HGRCPATH"] = os.path.join(self._threadtmp, '.hgrc')
617 env["HGRCPATH"] = os.path.join(self._threadtmp, '.hgrc')
618 env["DAEMON_PIDS"] = os.path.join(self._threadtmp, 'daemon.pids')
618 env["DAEMON_PIDS"] = os.path.join(self._threadtmp, 'daemon.pids')
619 env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
619 env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
620 env["HGMERGE"] = "internal:merge"
620 env["HGMERGE"] = "internal:merge"
621 env["HGUSER"] = "test"
621 env["HGUSER"] = "test"
622 env["HGENCODING"] = "ascii"
622 env["HGENCODING"] = "ascii"
623 env["HGENCODINGMODE"] = "strict"
623 env["HGENCODINGMODE"] = "strict"
624
624
625 # Reset some environment variables to well-known values so that
625 # Reset some environment variables to well-known values so that
626 # the tests produce repeatable output.
626 # the tests produce repeatable output.
627 env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
627 env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
628 env['TZ'] = 'GMT'
628 env['TZ'] = 'GMT'
629 env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
629 env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
630 env['COLUMNS'] = '80'
630 env['COLUMNS'] = '80'
631 env['TERM'] = 'xterm'
631 env['TERM'] = 'xterm'
632
632
633 for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
633 for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
634 'NO_PROXY').split():
634 'NO_PROXY').split():
635 if k in env:
635 if k in env:
636 del env[k]
636 del env[k]
637
637
638 # unset env related to hooks
638 # unset env related to hooks
639 for k in env.keys():
639 for k in env.keys():
640 if k.startswith('HG_'):
640 if k.startswith('HG_'):
641 del env[k]
641 del env[k]
642
642
643 return env
643 return env
644
644
645 def _createhgrc(self, path):
645 def _createhgrc(self, path):
646 """Create an hgrc file for this test."""
646 """Create an hgrc file for this test."""
647 hgrc = open(path, 'wb')
647 hgrc = open(path, 'wb')
648 hgrc.write('[ui]\n')
648 hgrc.write('[ui]\n')
649 hgrc.write('slash = True\n')
649 hgrc.write('slash = True\n')
650 hgrc.write('interactive = False\n')
650 hgrc.write('interactive = False\n')
651 hgrc.write('mergemarkers = detailed\n')
651 hgrc.write('mergemarkers = detailed\n')
652 hgrc.write('[defaults]\n')
652 hgrc.write('[defaults]\n')
653 hgrc.write('backout = -d "0 0"\n')
653 hgrc.write('backout = -d "0 0"\n')
654 hgrc.write('commit = -d "0 0"\n')
654 hgrc.write('commit = -d "0 0"\n')
655 hgrc.write('shelve = --date "0 0"\n')
655 hgrc.write('shelve = --date "0 0"\n')
656 hgrc.write('tag = -d "0 0"\n')
656 hgrc.write('tag = -d "0 0"\n')
657 for opt in self._extraconfigopts:
657 for opt in self._extraconfigopts:
658 section, key = opt.split('.', 1)
658 section, key = opt.split('.', 1)
659 assert '=' in key, ('extra config opt %s must '
659 assert '=' in key, ('extra config opt %s must '
660 'have an = for assignment' % opt)
660 'have an = for assignment' % opt)
661 hgrc.write('[%s]\n%s\n' % (section, key))
661 hgrc.write('[%s]\n%s\n' % (section, key))
662 hgrc.close()
662 hgrc.close()
663
663
664 def fail(self, msg):
664 def fail(self, msg):
665 # unittest differentiates between errored and failed.
665 # unittest differentiates between errored and failed.
666 # Failed is denoted by AssertionError (by default at least).
666 # Failed is denoted by AssertionError (by default at least).
667 raise AssertionError(msg)
667 raise AssertionError(msg)
668
668
669 class PythonTest(Test):
669 class PythonTest(Test):
670 """A Python-based test."""
670 """A Python-based test."""
671
671
672 @property
672 @property
673 def refpath(self):
673 def refpath(self):
674 return os.path.join(self._testdir, '%s.out' % self.name)
674 return os.path.join(self._testdir, '%s.out' % self.name)
675
675
676 def _run(self, replacements, env):
676 def _run(self, replacements, env):
677 py3kswitch = self._py3kwarnings and ' -3' or ''
677 py3kswitch = self._py3kwarnings and ' -3' or ''
678 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self.path)
678 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self.path)
679 vlog("# Running", cmd)
679 vlog("# Running", cmd)
680 if os.name == 'nt':
680 if os.name == 'nt':
681 replacements.append((r'\r\n', '\n'))
681 replacements.append((r'\r\n', '\n'))
682 result = run(cmd, self._testtmp, replacements, env,
682 result = run(cmd, self._testtmp, replacements, env,
683 debug=self._debug, timeout=self._timeout)
683 debug=self._debug, timeout=self._timeout)
684 if self._aborted:
684 if self._aborted:
685 raise KeyboardInterrupt()
685 raise KeyboardInterrupt()
686
686
687 return result
687 return result
688
688
689 class TTest(Test):
689 class TTest(Test):
690 """A "t test" is a test backed by a .t file."""
690 """A "t test" is a test backed by a .t file."""
691
691
692 SKIPPED_PREFIX = 'skipped: '
692 SKIPPED_PREFIX = 'skipped: '
693 FAILED_PREFIX = 'hghave check failed: '
693 FAILED_PREFIX = 'hghave check failed: '
694 NEEDESCAPE = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
694 NEEDESCAPE = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
695
695
696 ESCAPESUB = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
696 ESCAPESUB = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
697 ESCAPEMAP = dict((chr(i), r'\x%02x' % i) for i in range(256))
697 ESCAPEMAP = dict((chr(i), r'\x%02x' % i) for i in range(256))
698 ESCAPEMAP.update({'\\': '\\\\', '\r': r'\r'})
698 ESCAPEMAP.update({'\\': '\\\\', '\r': r'\r'})
699
699
700 @property
700 @property
701 def refpath(self):
701 def refpath(self):
702 return os.path.join(self._testdir, self.name)
702 return os.path.join(self._testdir, self.name)
703
703
704 def _run(self, replacements, env):
704 def _run(self, replacements, env):
705 f = open(self.path, 'rb')
705 f = open(self.path, 'rb')
706 lines = f.readlines()
706 lines = f.readlines()
707 f.close()
707 f.close()
708
708
709 salt, script, after, expected = self._parsetest(lines)
709 salt, script, after, expected = self._parsetest(lines)
710
710
711 # Write out the generated script.
711 # Write out the generated script.
712 fname = '%s.sh' % self._testtmp
712 fname = '%s.sh' % self._testtmp
713 f = open(fname, 'wb')
713 f = open(fname, 'wb')
714 for l in script:
714 for l in script:
715 f.write(l)
715 f.write(l)
716 f.close()
716 f.close()
717
717
718 cmd = '%s "%s"' % (self._shell, fname)
718 cmd = '%s "%s"' % (self._shell, fname)
719 vlog("# Running", cmd)
719 vlog("# Running", cmd)
720
720
721 exitcode, output = run(cmd, self._testtmp, replacements, env,
721 exitcode, output = run(cmd, self._testtmp, replacements, env,
722 debug=self._debug, timeout=self._timeout)
722 debug=self._debug, timeout=self._timeout)
723
723
724 if self._aborted:
724 if self._aborted:
725 raise KeyboardInterrupt()
725 raise KeyboardInterrupt()
726
726
727 # Do not merge output if skipped. Return hghave message instead.
727 # Do not merge output if skipped. Return hghave message instead.
728 # Similarly, with --debug, output is None.
728 # Similarly, with --debug, output is None.
729 if exitcode == self.SKIPPED_STATUS or output is None:
729 if exitcode == self.SKIPPED_STATUS or output is None:
730 return exitcode, output
730 return exitcode, output
731
731
732 return self._processoutput(exitcode, output, salt, after, expected)
732 return self._processoutput(exitcode, output, salt, after, expected)
733
733
734 def _hghave(self, reqs):
734 def _hghave(self, reqs):
735 # TODO do something smarter when all other uses of hghave are gone.
735 # TODO do something smarter when all other uses of hghave are gone.
736 tdir = self._testdir.replace('\\', '/')
736 tdir = self._testdir.replace('\\', '/')
737 proc = Popen4('%s -c "%s/hghave %s"' %
737 proc = Popen4('%s -c "%s/hghave %s"' %
738 (self._shell, tdir, ' '.join(reqs)),
738 (self._shell, tdir, ' '.join(reqs)),
739 self._testtmp, 0)
739 self._testtmp, 0)
740 stdout, stderr = proc.communicate()
740 stdout, stderr = proc.communicate()
741 ret = proc.wait()
741 ret = proc.wait()
742 if wifexited(ret):
742 if wifexited(ret):
743 ret = os.WEXITSTATUS(ret)
743 ret = os.WEXITSTATUS(ret)
744 if ret == 2:
744 if ret == 2:
745 print stdout
745 print stdout
746 sys.exit(1)
746 sys.exit(1)
747
747
748 return ret == 0
748 return ret == 0
749
749
750 def _parsetest(self, lines):
750 def _parsetest(self, lines):
751 # We generate a shell script which outputs unique markers to line
751 # We generate a shell script which outputs unique markers to line
752 # up script results with our source. These markers include input
752 # up script results with our source. These markers include input
753 # line number and the last return code.
753 # line number and the last return code.
754 salt = "SALT" + str(time.time())
754 salt = "SALT" + str(time.time())
755 def addsalt(line, inpython):
755 def addsalt(line, inpython):
756 if inpython:
756 if inpython:
757 script.append('%s %d 0\n' % (salt, line))
757 script.append('%s %d 0\n' % (salt, line))
758 else:
758 else:
759 script.append('echo %s %s $?\n' % (salt, line))
759 script.append('echo %s %s $?\n' % (salt, line))
760
760
761 script = []
761 script = []
762
762
763 # After we run the shell script, we re-unify the script output
763 # After we run the shell script, we re-unify the script output
764 # with non-active parts of the source, with synchronization by our
764 # with non-active parts of the source, with synchronization by our
765 # SALT line number markers. The after table contains the non-active
765 # SALT line number markers. The after table contains the non-active
766 # components, ordered by line number.
766 # components, ordered by line number.
767 after = {}
767 after = {}
768
768
769 # Expected shell script output.
769 # Expected shell script output.
770 expected = {}
770 expected = {}
771
771
772 pos = prepos = -1
772 pos = prepos = -1
773
773
774 # True or False when in a true or false conditional section
774 # True or False when in a true or false conditional section
775 skipping = None
775 skipping = None
776
776
777 # We keep track of whether or not we're in a Python block so we
777 # We keep track of whether or not we're in a Python block so we
778 # can generate the surrounding doctest magic.
778 # can generate the surrounding doctest magic.
779 inpython = False
779 inpython = False
780
780
781 if self._debug:
781 if self._debug:
782 script.append('set -x\n')
782 script.append('set -x\n')
783 if os.getenv('MSYSTEM'):
783 if os.getenv('MSYSTEM'):
784 script.append('alias pwd="pwd -W"\n')
784 script.append('alias pwd="pwd -W"\n')
785
785
786 for n, l in enumerate(lines):
786 for n, l in enumerate(lines):
787 if not l.endswith('\n'):
787 if not l.endswith('\n'):
788 l += '\n'
788 l += '\n'
789 if l.startswith('#if'):
789 if l.startswith('#if'):
790 lsplit = l.split()
790 lsplit = l.split()
791 if len(lsplit) < 2 or lsplit[0] != '#if':
791 if len(lsplit) < 2 or lsplit[0] != '#if':
792 after.setdefault(pos, []).append(' !!! invalid #if\n')
792 after.setdefault(pos, []).append(' !!! invalid #if\n')
793 if skipping is not None:
793 if skipping is not None:
794 after.setdefault(pos, []).append(' !!! nested #if\n')
794 after.setdefault(pos, []).append(' !!! nested #if\n')
795 skipping = not self._hghave(lsplit[1:])
795 skipping = not self._hghave(lsplit[1:])
796 after.setdefault(pos, []).append(l)
796 after.setdefault(pos, []).append(l)
797 elif l.startswith('#else'):
797 elif l.startswith('#else'):
798 if skipping is None:
798 if skipping is None:
799 after.setdefault(pos, []).append(' !!! missing #if\n')
799 after.setdefault(pos, []).append(' !!! missing #if\n')
800 skipping = not skipping
800 skipping = not skipping
801 after.setdefault(pos, []).append(l)
801 after.setdefault(pos, []).append(l)
802 elif l.startswith('#endif'):
802 elif l.startswith('#endif'):
803 if skipping is None:
803 if skipping is None:
804 after.setdefault(pos, []).append(' !!! missing #if\n')
804 after.setdefault(pos, []).append(' !!! missing #if\n')
805 skipping = None
805 skipping = None
806 after.setdefault(pos, []).append(l)
806 after.setdefault(pos, []).append(l)
807 elif skipping:
807 elif skipping:
808 after.setdefault(pos, []).append(l)
808 after.setdefault(pos, []).append(l)
809 elif l.startswith(' >>> '): # python inlines
809 elif l.startswith(' >>> '): # python inlines
810 after.setdefault(pos, []).append(l)
810 after.setdefault(pos, []).append(l)
811 prepos = pos
811 prepos = pos
812 pos = n
812 pos = n
813 if not inpython:
813 if not inpython:
814 # We've just entered a Python block. Add the header.
814 # We've just entered a Python block. Add the header.
815 inpython = True
815 inpython = True
816 addsalt(prepos, False) # Make sure we report the exit code.
816 addsalt(prepos, False) # Make sure we report the exit code.
817 script.append('%s -m heredoctest <<EOF\n' % PYTHON)
817 script.append('%s -m heredoctest <<EOF\n' % PYTHON)
818 addsalt(n, True)
818 addsalt(n, True)
819 script.append(l[2:])
819 script.append(l[2:])
820 elif l.startswith(' ... '): # python inlines
820 elif l.startswith(' ... '): # python inlines
821 after.setdefault(prepos, []).append(l)
821 after.setdefault(prepos, []).append(l)
822 script.append(l[2:])
822 script.append(l[2:])
823 elif l.startswith(' $ '): # commands
823 elif l.startswith(' $ '): # commands
824 if inpython:
824 if inpython:
825 script.append('EOF\n')
825 script.append('EOF\n')
826 inpython = False
826 inpython = False
827 after.setdefault(pos, []).append(l)
827 after.setdefault(pos, []).append(l)
828 prepos = pos
828 prepos = pos
829 pos = n
829 pos = n
830 addsalt(n, False)
830 addsalt(n, False)
831 cmd = l[4:].split()
831 cmd = l[4:].split()
832 if len(cmd) == 2 and cmd[0] == 'cd':
832 if len(cmd) == 2 and cmd[0] == 'cd':
833 l = ' $ cd %s || exit 1\n' % cmd[1]
833 l = ' $ cd %s || exit 1\n' % cmd[1]
834 script.append(l[4:])
834 script.append(l[4:])
835 elif l.startswith(' > '): # continuations
835 elif l.startswith(' > '): # continuations
836 after.setdefault(prepos, []).append(l)
836 after.setdefault(prepos, []).append(l)
837 script.append(l[4:])
837 script.append(l[4:])
838 elif l.startswith(' '): # results
838 elif l.startswith(' '): # results
839 # Queue up a list of expected results.
839 # Queue up a list of expected results.
840 expected.setdefault(pos, []).append(l[2:])
840 expected.setdefault(pos, []).append(l[2:])
841 else:
841 else:
842 if inpython:
842 if inpython:
843 script.append('EOF\n')
843 script.append('EOF\n')
844 inpython = False
844 inpython = False
845 # Non-command/result. Queue up for merged output.
845 # Non-command/result. Queue up for merged output.
846 after.setdefault(pos, []).append(l)
846 after.setdefault(pos, []).append(l)
847
847
848 if inpython:
848 if inpython:
849 script.append('EOF\n')
849 script.append('EOF\n')
850 if skipping is not None:
850 if skipping is not None:
851 after.setdefault(pos, []).append(' !!! missing #endif\n')
851 after.setdefault(pos, []).append(' !!! missing #endif\n')
852 addsalt(n + 1, False)
852 addsalt(n + 1, False)
853
853
854 return salt, script, after, expected
854 return salt, script, after, expected
855
855
856 def _processoutput(self, exitcode, output, salt, after, expected):
856 def _processoutput(self, exitcode, output, salt, after, expected):
857 # Merge the script output back into a unified test.
857 # Merge the script output back into a unified test.
858 warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
858 warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
859 if exitcode != 0:
859 if exitcode != 0:
860 warnonly = 3
860 warnonly = 3
861
861
862 pos = -1
862 pos = -1
863 postout = []
863 postout = []
864 for l in output:
864 for l in output:
865 lout, lcmd = l, None
865 lout, lcmd = l, None
866 if salt in l:
866 if salt in l:
867 lout, lcmd = l.split(salt, 1)
867 lout, lcmd = l.split(salt, 1)
868
868
869 if lout:
869 if lout:
870 if not lout.endswith('\n'):
870 if not lout.endswith('\n'):
871 lout += ' (no-eol)\n'
871 lout += ' (no-eol)\n'
872
872
873 # Find the expected output at the current position.
873 # Find the expected output at the current position.
874 el = None
874 el = None
875 if expected.get(pos, None):
875 if expected.get(pos, None):
876 el = expected[pos].pop(0)
876 el = expected[pos].pop(0)
877
877
878 r = TTest.linematch(el, lout)
878 r = TTest.linematch(el, lout)
879 if isinstance(r, str):
879 if isinstance(r, str):
880 if r == '+glob':
880 if r == '+glob':
881 lout = el[:-1] + ' (glob)\n'
881 lout = el[:-1] + ' (glob)\n'
882 r = '' # Warn only this line.
882 r = '' # Warn only this line.
883 elif r == '-glob':
883 elif r == '-glob':
884 lout = ''.join(el.rsplit(' (glob)', 1))
884 lout = ''.join(el.rsplit(' (glob)', 1))
885 r = '' # Warn only this line.
885 r = '' # Warn only this line.
886 else:
886 else:
887 log('\ninfo, unknown linematch result: %r\n' % r)
887 log('\ninfo, unknown linematch result: %r\n' % r)
888 r = False
888 r = False
889 if r:
889 if r:
890 postout.append(' ' + el)
890 postout.append(' ' + el)
891 else:
891 else:
892 if self.NEEDESCAPE(lout):
892 if self.NEEDESCAPE(lout):
893 lout = TTest._stringescape('%s (esc)\n' %
893 lout = TTest._stringescape('%s (esc)\n' %
894 lout.rstrip('\n'))
894 lout.rstrip('\n'))
895 postout.append(' ' + lout) # Let diff deal with it.
895 postout.append(' ' + lout) # Let diff deal with it.
896 if r != '': # If line failed.
896 if r != '': # If line failed.
897 warnonly = 3 # for sure not
897 warnonly = 3 # for sure not
898 elif warnonly == 1: # Is "not yet" and line is warn only.
898 elif warnonly == 1: # Is "not yet" and line is warn only.
899 warnonly = 2 # Yes do warn.
899 warnonly = 2 # Yes do warn.
900
900
901 if lcmd:
901 if lcmd:
902 # Add on last return code.
902 # Add on last return code.
903 ret = int(lcmd.split()[1])
903 ret = int(lcmd.split()[1])
904 if ret != 0:
904 if ret != 0:
905 postout.append(' [%s]\n' % ret)
905 postout.append(' [%s]\n' % ret)
906 if pos in after:
906 if pos in after:
907 # Merge in non-active test bits.
907 # Merge in non-active test bits.
908 postout += after.pop(pos)
908 postout += after.pop(pos)
909 pos = int(lcmd.split()[0])
909 pos = int(lcmd.split()[0])
910
910
911 if pos in after:
911 if pos in after:
912 postout += after.pop(pos)
912 postout += after.pop(pos)
913
913
914 if warnonly == 2:
914 if warnonly == 2:
915 exitcode = False # Set exitcode to warned.
915 exitcode = False # Set exitcode to warned.
916
916
917 return exitcode, postout
917 return exitcode, postout
918
918
919 @staticmethod
919 @staticmethod
920 def rematch(el, l):
920 def rematch(el, l):
921 try:
921 try:
922 # use \Z to ensure that the regex matches to the end of the string
922 # use \Z to ensure that the regex matches to the end of the string
923 if os.name == 'nt':
923 if os.name == 'nt':
924 return re.match(el + r'\r?\n\Z', l)
924 return re.match(el + r'\r?\n\Z', l)
925 return re.match(el + r'\n\Z', l)
925 return re.match(el + r'\n\Z', l)
926 except re.error:
926 except re.error:
927 # el is an invalid regex
927 # el is an invalid regex
928 return False
928 return False
929
929
930 @staticmethod
930 @staticmethod
931 def globmatch(el, l):
931 def globmatch(el, l):
932 # The only supported special characters are * and ? plus / which also
932 # The only supported special characters are * and ? plus / which also
933 # matches \ on windows. Escaping of these characters is supported.
933 # matches \ on windows. Escaping of these characters is supported.
934 if el + '\n' == l:
934 if el + '\n' == l:
935 if os.altsep:
935 if os.altsep:
936 # matching on "/" is not needed for this line
936 # matching on "/" is not needed for this line
937 return '-glob'
937 return '-glob'
938 return True
938 return True
939 i, n = 0, len(el)
939 i, n = 0, len(el)
940 res = ''
940 res = ''
941 while i < n:
941 while i < n:
942 c = el[i]
942 c = el[i]
943 i += 1
943 i += 1
944 if c == '\\' and el[i] in '*?\\/':
944 if c == '\\' and el[i] in '*?\\/':
945 res += el[i - 1:i + 1]
945 res += el[i - 1:i + 1]
946 i += 1
946 i += 1
947 elif c == '*':
947 elif c == '*':
948 res += '.*'
948 res += '.*'
949 elif c == '?':
949 elif c == '?':
950 res += '.'
950 res += '.'
951 elif c == '/' and os.altsep:
951 elif c == '/' and os.altsep:
952 res += '[/\\\\]'
952 res += '[/\\\\]'
953 else:
953 else:
954 res += re.escape(c)
954 res += re.escape(c)
955 return TTest.rematch(res, l)
955 return TTest.rematch(res, l)
956
956
957 @staticmethod
957 @staticmethod
958 def linematch(el, l):
958 def linematch(el, l):
959 if el == l: # perfect match (fast)
959 if el == l: # perfect match (fast)
960 return True
960 return True
961 if el:
961 if el:
962 if el.endswith(" (esc)\n"):
962 if el.endswith(" (esc)\n"):
963 el = el[:-7].decode('string-escape') + '\n'
963 el = el[:-7].decode('string-escape') + '\n'
964 if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
964 if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
965 return True
965 return True
966 if el.endswith(" (re)\n"):
966 if el.endswith(" (re)\n"):
967 return TTest.rematch(el[:-6], l)
967 return TTest.rematch(el[:-6], l)
968 if el.endswith(" (glob)\n"):
968 if el.endswith(" (glob)\n"):
969 return TTest.globmatch(el[:-8], l)
969 return TTest.globmatch(el[:-8], l)
970 if os.altsep and l.replace('\\', '/') == el:
970 if os.altsep and l.replace('\\', '/') == el:
971 return '+glob'
971 return '+glob'
972 return False
972 return False
973
973
974 @staticmethod
974 @staticmethod
975 def parsehghaveoutput(lines):
975 def parsehghaveoutput(lines):
976 '''Parse hghave log lines.
976 '''Parse hghave log lines.
977
977
978 Return tuple of lists (missing, failed):
978 Return tuple of lists (missing, failed):
979 * the missing/unknown features
979 * the missing/unknown features
980 * the features for which existence check failed'''
980 * the features for which existence check failed'''
981 missing = []
981 missing = []
982 failed = []
982 failed = []
983 for line in lines:
983 for line in lines:
984 if line.startswith(TTest.SKIPPED_PREFIX):
984 if line.startswith(TTest.SKIPPED_PREFIX):
985 line = line.splitlines()[0]
985 line = line.splitlines()[0]
986 missing.append(line[len(TTest.SKIPPED_PREFIX):])
986 missing.append(line[len(TTest.SKIPPED_PREFIX):])
987 elif line.startswith(TTest.FAILED_PREFIX):
987 elif line.startswith(TTest.FAILED_PREFIX):
988 line = line.splitlines()[0]
988 line = line.splitlines()[0]
989 failed.append(line[len(TTest.FAILED_PREFIX):])
989 failed.append(line[len(TTest.FAILED_PREFIX):])
990
990
991 return missing, failed
991 return missing, failed
992
992
993 @staticmethod
993 @staticmethod
994 def _escapef(m):
994 def _escapef(m):
995 return TTest.ESCAPEMAP[m.group(0)]
995 return TTest.ESCAPEMAP[m.group(0)]
996
996
997 @staticmethod
997 @staticmethod
998 def _stringescape(s):
998 def _stringescape(s):
999 return TTest.ESCAPESUB(TTest._escapef, s)
999 return TTest.ESCAPESUB(TTest._escapef, s)
1000
1000
1001
1001
1002 wifexited = getattr(os, "WIFEXITED", lambda x: False)
1002 wifexited = getattr(os, "WIFEXITED", lambda x: False)
1003 def run(cmd, wd, replacements, env, debug=False, timeout=None):
1003 def run(cmd, wd, replacements, env, debug=False, timeout=None):
1004 """Run command in a sub-process, capturing the output (stdout and stderr).
1004 """Run command in a sub-process, capturing the output (stdout and stderr).
1005 Return a tuple (exitcode, output). output is None in debug mode."""
1005 Return a tuple (exitcode, output). output is None in debug mode."""
1006 if debug:
1006 if debug:
1007 proc = subprocess.Popen(cmd, shell=True, cwd=wd, env=env)
1007 proc = subprocess.Popen(cmd, shell=True, cwd=wd, env=env)
1008 ret = proc.wait()
1008 ret = proc.wait()
1009 return (ret, None)
1009 return (ret, None)
1010
1010
1011 proc = Popen4(cmd, wd, timeout, env)
1011 proc = Popen4(cmd, wd, timeout, env)
1012 def cleanup():
1012 def cleanup():
1013 terminate(proc)
1013 terminate(proc)
1014 ret = proc.wait()
1014 ret = proc.wait()
1015 if ret == 0:
1015 if ret == 0:
1016 ret = signal.SIGTERM << 8
1016 ret = signal.SIGTERM << 8
1017 killdaemons(env['DAEMON_PIDS'])
1017 killdaemons(env['DAEMON_PIDS'])
1018 return ret
1018 return ret
1019
1019
1020 output = ''
1020 output = ''
1021 proc.tochild.close()
1021 proc.tochild.close()
1022
1022
1023 try:
1023 try:
1024 output = proc.fromchild.read()
1024 output = proc.fromchild.read()
1025 except KeyboardInterrupt:
1025 except KeyboardInterrupt:
1026 vlog('# Handling keyboard interrupt')
1026 vlog('# Handling keyboard interrupt')
1027 cleanup()
1027 cleanup()
1028 raise
1028 raise
1029
1029
1030 ret = proc.wait()
1030 ret = proc.wait()
1031 if wifexited(ret):
1031 if wifexited(ret):
1032 ret = os.WEXITSTATUS(ret)
1032 ret = os.WEXITSTATUS(ret)
1033
1033
1034 if proc.timeout:
1034 if proc.timeout:
1035 ret = 'timeout'
1035 ret = 'timeout'
1036
1036
1037 if ret:
1037 if ret:
1038 killdaemons(env['DAEMON_PIDS'])
1038 killdaemons(env['DAEMON_PIDS'])
1039
1039
1040 for s, r in replacements:
1040 for s, r in replacements:
1041 output = re.sub(s, r, output)
1041 output = re.sub(s, r, output)
1042 return ret, output.splitlines(True)
1042 return ret, output.splitlines(True)
1043
1043
1044 iolock = threading.Lock()
1044 iolock = threading.Lock()
1045
1045
1046 class SkipTest(Exception):
1046 class SkipTest(Exception):
1047 """Raised to indicate that a test is to be skipped."""
1047 """Raised to indicate that a test is to be skipped."""
1048
1048
1049 class IgnoreTest(Exception):
1049 class IgnoreTest(Exception):
1050 """Raised to indicate that a test is to be ignored."""
1050 """Raised to indicate that a test is to be ignored."""
1051
1051
1052 class WarnTest(Exception):
1052 class WarnTest(Exception):
1053 """Raised to indicate that a test warned."""
1053 """Raised to indicate that a test warned."""
1054
1054
1055 class TestResult(unittest._TextTestResult):
1055 class TestResult(unittest._TextTestResult):
1056 """Holds results when executing via unittest."""
1056 """Holds results when executing via unittest."""
1057 # Don't worry too much about accessing the non-public _TextTestResult.
1057 # Don't worry too much about accessing the non-public _TextTestResult.
1058 # It is relatively common in Python testing tools.
1058 # It is relatively common in Python testing tools.
1059 def __init__(self, options, *args, **kwargs):
1059 def __init__(self, options, *args, **kwargs):
1060 super(TestResult, self).__init__(*args, **kwargs)
1060 super(TestResult, self).__init__(*args, **kwargs)
1061
1061
1062 self._options = options
1062 self._options = options
1063
1063
1064 # unittest.TestResult didn't have skipped until 2.7. We need to
1064 # unittest.TestResult didn't have skipped until 2.7. We need to
1065 # polyfill it.
1065 # polyfill it.
1066 self.skipped = []
1066 self.skipped = []
1067
1067
1068 # We have a custom "ignored" result that isn't present in any Python
1068 # We have a custom "ignored" result that isn't present in any Python
1069 # unittest implementation. It is very similar to skipped. It may make
1069 # unittest implementation. It is very similar to skipped. It may make
1070 # sense to map it into skip some day.
1070 # sense to map it into skip some day.
1071 self.ignored = []
1071 self.ignored = []
1072
1072
1073 # We have a custom "warned" result that isn't present in any Python
1073 # We have a custom "warned" result that isn't present in any Python
1074 # unittest implementation. It is very similar to failed. It may make
1074 # unittest implementation. It is very similar to failed. It may make
1075 # sense to map it into fail some day.
1075 # sense to map it into fail some day.
1076 self.warned = []
1076 self.warned = []
1077
1077
1078 self.times = []
1078 self.times = []
1079 self._started = {}
1079 self._started = {}
1080
1080
1081 def addFailure(self, test, reason):
1081 def addFailure(self, test, reason):
1082 self.failures.append((test, reason))
1082 self.failures.append((test, reason))
1083
1083
1084 if self._options.first:
1084 if self._options.first:
1085 self.stop()
1085 self.stop()
1086 else:
1086 else:
1087 if not self._options.nodiff:
1087 if not self._options.nodiff:
1088 self.stream.write('\nERROR: %s output changed\n' % test)
1088 self.stream.write('\nERROR: %s output changed\n' % test)
1089
1089
1090 self.stream.write('!')
1090 self.stream.write('!')
1091
1091
1092 def addError(self, *args, **kwargs):
1092 def addError(self, *args, **kwargs):
1093 super(TestResult, self).addError(*args, **kwargs)
1093 super(TestResult, self).addError(*args, **kwargs)
1094
1094
1095 if self._options.first:
1095 if self._options.first:
1096 self.stop()
1096 self.stop()
1097
1097
1098 # Polyfill.
1098 # Polyfill.
1099 def addSkip(self, test, reason):
1099 def addSkip(self, test, reason):
1100 self.skipped.append((test, reason))
1100 self.skipped.append((test, reason))
1101
1101
1102 if self.showAll:
1102 if self.showAll:
1103 self.stream.writeln('skipped %s' % reason)
1103 self.stream.writeln('skipped %s' % reason)
1104 else:
1104 else:
1105 self.stream.write('s')
1105 self.stream.write('s')
1106 self.stream.flush()
1106 self.stream.flush()
1107
1107
1108 def addIgnore(self, test, reason):
1108 def addIgnore(self, test, reason):
1109 self.ignored.append((test, reason))
1109 self.ignored.append((test, reason))
1110
1110
1111 if self.showAll:
1111 if self.showAll:
1112 self.stream.writeln('ignored %s' % reason)
1112 self.stream.writeln('ignored %s' % reason)
1113 else:
1113 else:
1114 if reason != 'not retesting':
1114 if reason != 'not retesting':
1115 self.stream.write('i')
1115 self.stream.write('i')
1116 self.stream.flush()
1116 self.stream.flush()
1117
1117
1118 def addWarn(self, test, reason):
1118 def addWarn(self, test, reason):
1119 self.warned.append((test, reason))
1119 self.warned.append((test, reason))
1120
1120
1121 if self._options.first:
1121 if self._options.first:
1122 self.stop()
1122 self.stop()
1123
1123
1124 if self.showAll:
1124 if self.showAll:
1125 self.stream.writeln('warned %s' % reason)
1125 self.stream.writeln('warned %s' % reason)
1126 else:
1126 else:
1127 self.stream.write('~')
1127 self.stream.write('~')
1128 self.stream.flush()
1128 self.stream.flush()
1129
1129
1130 def addOutputMismatch(self, test, ret, got, expected):
1130 def addOutputMismatch(self, test, ret, got, expected):
1131 """Record a mismatch in test output for a particular test."""
1131 """Record a mismatch in test output for a particular test."""
1132
1132
1133 accepted = False
1133 accepted = False
1134
1134
1135 iolock.acquire()
1135 iolock.acquire()
1136 if self._options.nodiff:
1136 if self._options.nodiff:
1137 pass
1137 pass
1138 elif self._options.view:
1138 elif self._options.view:
1139 os.system("%s %s %s" %
1139 os.system("%s %s %s" %
1140 (self._options.view, test.refpath, test.errpath))
1140 (self._options.view, test.refpath, test.errpath))
1141 else:
1141 else:
1142 failed, lines = getdiff(expected, got,
1142 failed, lines = getdiff(expected, got,
1143 test.refpath, test.errpath)
1143 test.refpath, test.errpath)
1144 if failed:
1144 if failed:
1145 self.addFailure(test, 'diff generation failed')
1145 self.addFailure(test, 'diff generation failed')
1146 else:
1146 else:
1147 self.stream.write('\n')
1147 self.stream.write('\n')
1148 for line in lines:
1148 for line in lines:
1149 self.stream.write(line)
1149 self.stream.write(line)
1150 self.stream.flush()
1150 self.stream.flush()
1151
1151
1152 # handle interactive prompt without releasing iolock
1152 # handle interactive prompt without releasing iolock
1153 if self._options.interactive:
1153 if self._options.interactive:
1154 self.stream.write('Accept this change? [n] ')
1154 self.stream.write('Accept this change? [n] ')
1155 answer = sys.stdin.readline().strip()
1155 answer = sys.stdin.readline().strip()
1156 if answer.lower() in ('y', 'yes'):
1156 if answer.lower() in ('y', 'yes'):
1157 if test.name.endswith('.t'):
1157 if test.name.endswith('.t'):
1158 rename(test.errpath, test.path)
1158 rename(test.errpath, test.path)
1159 else:
1159 else:
1160 rename(test.errpath, '%s.out' % test.path)
1160 rename(test.errpath, '%s.out' % test.path)
1161 accepted = True
1161 accepted = True
1162
1162
1163 iolock.release()
1163 iolock.release()
1164
1164
1165 return accepted
1165 return accepted
1166
1166
1167 def startTest(self, test):
1167 def startTest(self, test):
1168 super(TestResult, self).startTest(test)
1168 super(TestResult, self).startTest(test)
1169
1169
1170 self._started[test.name] = time.time()
1170 self._started[test.name] = time.time()
1171
1171
1172 def stopTest(self, test, interrupted=False):
1172 def stopTest(self, test, interrupted=False):
1173 super(TestResult, self).stopTest(test)
1173 super(TestResult, self).stopTest(test)
1174
1174
1175 self.times.append((test.name, time.time() - self._started[test.name]))
1175 self.times.append((test.name, time.time() - self._started[test.name]))
1176 del self._started[test.name]
1176 del self._started[test.name]
1177
1177
1178 if interrupted:
1178 if interrupted:
1179 self.stream.writeln('INTERRUPTED: %s (after %d seconds)' % (
1179 self.stream.writeln('INTERRUPTED: %s (after %d seconds)' % (
1180 test.name, self.times[-1][1]))
1180 test.name, self.times[-1][1]))
1181
1181
1182 class TestSuite(unittest.TestSuite):
1182 class TestSuite(unittest.TestSuite):
1183 """Custom unitest TestSuite that knows how to execute Mercurial tests."""
1183 """Custom unitest TestSuite that knows how to execute Mercurial tests."""
1184
1184
1185 def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None,
1185 def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None,
1186 retest=False, keywords=None, loop=False,
1186 retest=False, keywords=None, loop=False,
1187 *args, **kwargs):
1187 *args, **kwargs):
1188 """Create a new instance that can run tests with a configuration.
1188 """Create a new instance that can run tests with a configuration.
1189
1189
1190 testdir specifies the directory where tests are executed from. This
1190 testdir specifies the directory where tests are executed from. This
1191 is typically the ``tests`` directory from Mercurial's source
1191 is typically the ``tests`` directory from Mercurial's source
1192 repository.
1192 repository.
1193
1193
1194 jobs specifies the number of jobs to run concurrently. Each test
1194 jobs specifies the number of jobs to run concurrently. Each test
1195 executes on its own thread. Tests actually spawn new processes, so
1195 executes on its own thread. Tests actually spawn new processes, so
1196 state mutation should not be an issue.
1196 state mutation should not be an issue.
1197
1197
1198 whitelist and blacklist denote tests that have been whitelisted and
1198 whitelist and blacklist denote tests that have been whitelisted and
1199 blacklisted, respectively. These arguments don't belong in TestSuite.
1199 blacklisted, respectively. These arguments don't belong in TestSuite.
1200 Instead, whitelist and blacklist should be handled by the thing that
1200 Instead, whitelist and blacklist should be handled by the thing that
1201 populates the TestSuite with tests. They are present to preserve
1201 populates the TestSuite with tests. They are present to preserve
1202 backwards compatible behavior which reports skipped tests as part
1202 backwards compatible behavior which reports skipped tests as part
1203 of the results.
1203 of the results.
1204
1204
1205 retest denotes whether to retest failed tests. This arguably belongs
1205 retest denotes whether to retest failed tests. This arguably belongs
1206 outside of TestSuite.
1206 outside of TestSuite.
1207
1207
1208 keywords denotes key words that will be used to filter which tests
1208 keywords denotes key words that will be used to filter which tests
1209 to execute. This arguably belongs outside of TestSuite.
1209 to execute. This arguably belongs outside of TestSuite.
1210
1210
1211 loop denotes whether to loop over tests forever.
1211 loop denotes whether to loop over tests forever.
1212 """
1212 """
1213 super(TestSuite, self).__init__(*args, **kwargs)
1213 super(TestSuite, self).__init__(*args, **kwargs)
1214
1214
1215 self._jobs = jobs
1215 self._jobs = jobs
1216 self._whitelist = whitelist
1216 self._whitelist = whitelist
1217 self._blacklist = blacklist
1217 self._blacklist = blacklist
1218 self._retest = retest
1218 self._retest = retest
1219 self._keywords = keywords
1219 self._keywords = keywords
1220 self._loop = loop
1220 self._loop = loop
1221
1221
1222 def run(self, result):
1222 def run(self, result):
1223 # We have a number of filters that need to be applied. We do this
1223 # We have a number of filters that need to be applied. We do this
1224 # here instead of inside Test because it makes the running logic for
1224 # here instead of inside Test because it makes the running logic for
1225 # Test simpler.
1225 # Test simpler.
1226 tests = []
1226 tests = []
1227 for test in self._tests:
1227 for test in self._tests:
1228 if not os.path.exists(test.path):
1228 if not os.path.exists(test.path):
1229 result.addSkip(test, "Doesn't exist")
1229 result.addSkip(test, "Doesn't exist")
1230 continue
1230 continue
1231
1231
1232 if not (self._whitelist and test.name in self._whitelist):
1232 if not (self._whitelist and test.name in self._whitelist):
1233 if self._blacklist and test.name in self._blacklist:
1233 if self._blacklist and test.name in self._blacklist:
1234 result.addSkip(test, 'blacklisted')
1234 result.addSkip(test, 'blacklisted')
1235 continue
1235 continue
1236
1236
1237 if self._retest and not os.path.exists(test.errpath):
1237 if self._retest and not os.path.exists(test.errpath):
1238 result.addIgnore(test, 'not retesting')
1238 result.addIgnore(test, 'not retesting')
1239 continue
1239 continue
1240
1240
1241 if self._keywords:
1241 if self._keywords:
1242 f = open(test.path, 'rb')
1242 f = open(test.path, 'rb')
1243 t = f.read().lower() + test.name.lower()
1243 t = f.read().lower() + test.name.lower()
1244 f.close()
1244 f.close()
1245 ignored = False
1245 ignored = False
1246 for k in self._keywords.lower().split():
1246 for k in self._keywords.lower().split():
1247 if k not in t:
1247 if k not in t:
1248 result.addIgnore(test, "doesn't match keyword")
1248 result.addIgnore(test, "doesn't match keyword")
1249 ignored = True
1249 ignored = True
1250 break
1250 break
1251
1251
1252 if ignored:
1252 if ignored:
1253 continue
1253 continue
1254
1254
1255 tests.append(test)
1255 tests.append(test)
1256
1256
1257 runtests = list(tests)
1257 runtests = list(tests)
1258 done = queue.Queue()
1258 done = queue.Queue()
1259 running = 0
1259 running = 0
1260
1260
1261 def job(test, result):
1261 def job(test, result):
1262 try:
1262 try:
1263 test(result)
1263 test(result)
1264 done.put(None)
1264 done.put(None)
1265 except KeyboardInterrupt:
1265 except KeyboardInterrupt:
1266 pass
1266 pass
1267 except: # re-raises
1267 except: # re-raises
1268 done.put(('!', test, 'run-test raised an error, see traceback'))
1268 done.put(('!', test, 'run-test raised an error, see traceback'))
1269 raise
1269 raise
1270
1270
1271 try:
1271 try:
1272 while tests or running:
1272 while tests or running:
1273 if not done.empty() or running == self._jobs or not tests:
1273 if not done.empty() or running == self._jobs or not tests:
1274 try:
1274 try:
1275 done.get(True, 1)
1275 done.get(True, 1)
1276 if result and result.shouldStop:
1276 if result and result.shouldStop:
1277 break
1277 break
1278 except queue.Empty:
1278 except queue.Empty:
1279 continue
1279 continue
1280 running -= 1
1280 running -= 1
1281 if tests and not running == self._jobs:
1281 if tests and not running == self._jobs:
1282 test = tests.pop(0)
1282 test = tests.pop(0)
1283 if self._loop:
1283 if self._loop:
1284 tests.append(test)
1284 tests.append(test)
1285 t = threading.Thread(target=job, name=test.name,
1285 t = threading.Thread(target=job, name=test.name,
1286 args=(test, result))
1286 args=(test, result))
1287 t.start()
1287 t.start()
1288 running += 1
1288 running += 1
1289 except KeyboardInterrupt:
1289 except KeyboardInterrupt:
1290 for test in runtests:
1290 for test in runtests:
1291 test.abort()
1291 test.abort()
1292
1292
1293 return result
1293 return result
1294
1294
1295 class TextTestRunner(unittest.TextTestRunner):
1295 class TextTestRunner(unittest.TextTestRunner):
1296 """Custom unittest test runner that uses appropriate settings."""
1296 """Custom unittest test runner that uses appropriate settings."""
1297
1297
1298 def __init__(self, runner, *args, **kwargs):
1298 def __init__(self, runner, *args, **kwargs):
1299 super(TextTestRunner, self).__init__(*args, **kwargs)
1299 super(TextTestRunner, self).__init__(*args, **kwargs)
1300
1300
1301 self._runner = runner
1301 self._runner = runner
1302
1302
1303 def run(self, test):
1303 def run(self, test):
1304 result = TestResult(self._runner.options, self.stream,
1304 result = TestResult(self._runner.options, self.stream,
1305 self.descriptions, self.verbosity)
1305 self.descriptions, self.verbosity)
1306
1306
1307 test(result)
1307 test(result)
1308
1308
1309 failed = len(result.failures)
1309 failed = len(result.failures)
1310 warned = len(result.warned)
1310 warned = len(result.warned)
1311 skipped = len(result.skipped)
1311 skipped = len(result.skipped)
1312 ignored = len(result.ignored)
1312 ignored = len(result.ignored)
1313
1313
1314 self.stream.writeln('')
1314 self.stream.writeln('')
1315
1315
1316 if not self._runner.options.noskips:
1316 if not self._runner.options.noskips:
1317 for test, msg in result.skipped:
1317 for test, msg in result.skipped:
1318 self.stream.writeln('Skipped %s: %s' % (test.name, msg))
1318 self.stream.writeln('Skipped %s: %s' % (test.name, msg))
1319 for test, msg in result.warned:
1319 for test, msg in result.warned:
1320 self.stream.writeln('Warned %s: %s' % (test.name, msg))
1320 self.stream.writeln('Warned %s: %s' % (test.name, msg))
1321 for test, msg in result.failures:
1321 for test, msg in result.failures:
1322 self.stream.writeln('Failed %s: %s' % (test.name, msg))
1322 self.stream.writeln('Failed %s: %s' % (test.name, msg))
1323 for test, msg in result.errors:
1323 for test, msg in result.errors:
1324 self.stream.writeln('Errored %s: %s' % (test.name, msg))
1324 self.stream.writeln('Errored %s: %s' % (test.name, msg))
1325
1325
1326 self._runner._checkhglib('Tested')
1326 self._runner._checkhglib('Tested')
1327
1327
1328 # When '--retest' is enabled, only failure tests run. At this point
1328 # When '--retest' is enabled, only failure tests run. At this point
1329 # "result.testsRun" holds the count of failure test that has run. But
1329 # "result.testsRun" holds the count of failure test that has run. But
1330 # as while printing output, we have subtracted the skipped and ignored
1330 # as while printing output, we have subtracted the skipped and ignored
1331 # count from "result.testsRun". Therefore, to make the count remain
1331 # count from "result.testsRun". Therefore, to make the count remain
1332 # the same, we need to add skipped and ignored count in here.
1332 # the same, we need to add skipped and ignored count in here.
1333 if self._runner.options.retest:
1333 if self._runner.options.retest:
1334 result.testsRun = result.testsRun + skipped + ignored
1334 result.testsRun = result.testsRun + skipped + ignored
1335
1335
1336 # This differs from unittest's default output in that we don't count
1336 # This differs from unittest's default output in that we don't count
1337 # skipped and ignored tests as part of the total test count.
1337 # skipped and ignored tests as part of the total test count.
1338 self.stream.writeln('# Ran %d tests, %d skipped, %d warned, %d failed.'
1338 self.stream.writeln('# Ran %d tests, %d skipped, %d warned, %d failed.'
1339 % (result.testsRun - skipped - ignored,
1339 % (result.testsRun - skipped - ignored,
1340 skipped + ignored, warned, failed))
1340 skipped + ignored, warned, failed))
1341 if failed:
1341 if failed:
1342 self.stream.writeln('python hash seed: %s' %
1342 self.stream.writeln('python hash seed: %s' %
1343 os.environ['PYTHONHASHSEED'])
1343 os.environ['PYTHONHASHSEED'])
1344 if self._runner.options.time:
1344 if self._runner.options.time:
1345 self.printtimes(result.times)
1345 self.printtimes(result.times)
1346
1346
1347 return result
1347 return result
1348
1348
1349 def printtimes(self, times):
1349 def printtimes(self, times):
1350 self.stream.writeln('# Producing time report')
1350 self.stream.writeln('# Producing time report')
1351 times.sort(key=lambda t: (t[1], t[0]), reverse=True)
1351 times.sort(key=lambda t: (t[1], t[0]), reverse=True)
1352 cols = '%7.3f %s'
1352 cols = '%7.3f %s'
1353 self.stream.writeln('%-7s %s' % ('Time', 'Test'))
1353 self.stream.writeln('%-7s %s' % ('Time', 'Test'))
1354 for test, timetaken in times:
1354 for test, timetaken in times:
1355 self.stream.writeln(cols % (timetaken, test))
1355 self.stream.writeln(cols % (timetaken, test))
1356
1356
1357 class TestRunner(object):
1357 class TestRunner(object):
1358 """Holds context for executing tests.
1358 """Holds context for executing tests.
1359
1359
1360 Tests rely on a lot of state. This object holds it for them.
1360 Tests rely on a lot of state. This object holds it for them.
1361 """
1361 """
1362
1362
1363 # Programs required to run tests.
1363 # Programs required to run tests.
1364 REQUIREDTOOLS = [
1364 REQUIREDTOOLS = [
1365 os.path.basename(sys.executable),
1365 os.path.basename(sys.executable),
1366 'diff',
1366 'diff',
1367 'grep',
1367 'grep',
1368 'unzip',
1368 'unzip',
1369 'gunzip',
1369 'gunzip',
1370 'bunzip2',
1370 'bunzip2',
1371 'sed',
1371 'sed',
1372 ]
1372 ]
1373
1373
1374 # Maps file extensions to test class.
1374 # Maps file extensions to test class.
1375 TESTTYPES = [
1375 TESTTYPES = [
1376 ('.py', PythonTest),
1376 ('.py', PythonTest),
1377 ('.t', TTest),
1377 ('.t', TTest),
1378 ]
1378 ]
1379
1379
1380 def __init__(self):
1380 def __init__(self):
1381 self.options = None
1381 self.options = None
1382 self._testdir = None
1382 self._testdir = None
1383 self._hgtmp = None
1383 self._hgtmp = None
1384 self._installdir = None
1384 self._installdir = None
1385 self._bindir = None
1385 self._bindir = None
1386 self._tmpbinddir = None
1386 self._tmpbinddir = None
1387 self._pythondir = None
1387 self._pythondir = None
1388 self._coveragefile = None
1388 self._coveragefile = None
1389 self._createdfiles = []
1389 self._createdfiles = []
1390 self._hgpath = None
1390 self._hgpath = None
1391
1391
1392 def run(self, args, parser=None):
1392 def run(self, args, parser=None):
1393 """Run the test suite."""
1393 """Run the test suite."""
1394 oldmask = os.umask(022)
1394 oldmask = os.umask(022)
1395 try:
1395 try:
1396 parser = parser or getparser()
1396 parser = parser or getparser()
1397 options, args = parseargs(args, parser)
1397 options, args = parseargs(args, parser)
1398 self.options = options
1398 self.options = options
1399
1399
1400 self._checktools()
1400 self._checktools()
1401 tests = self.findtests(args)
1401 tests = self.findtests(args)
1402 return self._run(tests)
1402 return self._run(tests)
1403 finally:
1403 finally:
1404 os.umask(oldmask)
1404 os.umask(oldmask)
1405
1405
1406 def _run(self, tests):
1406 def _run(self, tests):
1407 if self.options.random:
1407 if self.options.random:
1408 random.shuffle(tests)
1408 random.shuffle(tests)
1409 else:
1409 else:
1410 # keywords for slow tests
1410 # keywords for slow tests
1411 slow = 'svn gendoc check-code-hg'.split()
1411 slow = 'svn gendoc check-code-hg'.split()
1412 def sortkey(f):
1412 def sortkey(f):
1413 # run largest tests first, as they tend to take the longest
1413 # run largest tests first, as they tend to take the longest
1414 try:
1414 try:
1415 val = -os.stat(f).st_size
1415 val = -os.stat(f).st_size
1416 except OSError, e:
1416 except OSError, e:
1417 if e.errno != errno.ENOENT:
1417 if e.errno != errno.ENOENT:
1418 raise
1418 raise
1419 return -1e9 # file does not exist, tell early
1419 return -1e9 # file does not exist, tell early
1420 for kw in slow:
1420 for kw in slow:
1421 if kw in f:
1421 if kw in f:
1422 val *= 10
1422 val *= 10
1423 return val
1423 return val
1424 tests.sort(key=sortkey)
1424 tests.sort(key=sortkey)
1425
1425
1426 self._testdir = os.environ['TESTDIR'] = os.getcwd()
1426 self._testdir = os.environ['TESTDIR'] = os.getcwd()
1427
1427
1428 if 'PYTHONHASHSEED' not in os.environ:
1428 if 'PYTHONHASHSEED' not in os.environ:
1429 # use a random python hash seed all the time
1429 # use a random python hash seed all the time
1430 # we do the randomness ourself to know what seed is used
1430 # we do the randomness ourself to know what seed is used
1431 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
1431 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
1432
1432
1433 if self.options.tmpdir:
1433 if self.options.tmpdir:
1434 self.options.keep_tmpdir = True
1434 self.options.keep_tmpdir = True
1435 tmpdir = self.options.tmpdir
1435 tmpdir = self.options.tmpdir
1436 if os.path.exists(tmpdir):
1436 if os.path.exists(tmpdir):
1437 # Meaning of tmpdir has changed since 1.3: we used to create
1437 # Meaning of tmpdir has changed since 1.3: we used to create
1438 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
1438 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
1439 # tmpdir already exists.
1439 # tmpdir already exists.
1440 print "error: temp dir %r already exists" % tmpdir
1440 print "error: temp dir %r already exists" % tmpdir
1441 return 1
1441 return 1
1442
1442
1443 # Automatically removing tmpdir sounds convenient, but could
1443 # Automatically removing tmpdir sounds convenient, but could
1444 # really annoy anyone in the habit of using "--tmpdir=/tmp"
1444 # really annoy anyone in the habit of using "--tmpdir=/tmp"
1445 # or "--tmpdir=$HOME".
1445 # or "--tmpdir=$HOME".
1446 #vlog("# Removing temp dir", tmpdir)
1446 #vlog("# Removing temp dir", tmpdir)
1447 #shutil.rmtree(tmpdir)
1447 #shutil.rmtree(tmpdir)
1448 os.makedirs(tmpdir)
1448 os.makedirs(tmpdir)
1449 else:
1449 else:
1450 d = None
1450 d = None
1451 if os.name == 'nt':
1451 if os.name == 'nt':
1452 # without this, we get the default temp dir location, but
1452 # without this, we get the default temp dir location, but
1453 # in all lowercase, which causes troubles with paths (issue3490)
1453 # in all lowercase, which causes troubles with paths (issue3490)
1454 d = os.getenv('TMP')
1454 d = os.getenv('TMP')
1455 tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
1455 tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
1456 self._hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)
1456 self._hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)
1457
1457
1458 if self.options.with_hg:
1458 if self.options.with_hg:
1459 self._installdir = None
1459 self._installdir = None
1460 self._bindir = os.path.dirname(os.path.realpath(
1460 self._bindir = os.path.dirname(os.path.realpath(
1461 self.options.with_hg))
1461 self.options.with_hg))
1462 self._tmpbindir = os.path.join(self._hgtmp, 'install', 'bin')
1462 self._tmpbindir = os.path.join(self._hgtmp, 'install', 'bin')
1463 os.makedirs(self._tmpbindir)
1463 os.makedirs(self._tmpbindir)
1464
1464
1465 # This looks redundant with how Python initializes sys.path from
1465 # This looks redundant with how Python initializes sys.path from
1466 # the location of the script being executed. Needed because the
1466 # the location of the script being executed. Needed because the
1467 # "hg" specified by --with-hg is not the only Python script
1467 # "hg" specified by --with-hg is not the only Python script
1468 # executed in the test suite that needs to import 'mercurial'
1468 # executed in the test suite that needs to import 'mercurial'
1469 # ... which means it's not really redundant at all.
1469 # ... which means it's not really redundant at all.
1470 self._pythondir = self._bindir
1470 self._pythondir = self._bindir
1471 else:
1471 else:
1472 self._installdir = os.path.join(self._hgtmp, "install")
1472 self._installdir = os.path.join(self._hgtmp, "install")
1473 self._bindir = os.environ["BINDIR"] = \
1473 self._bindir = os.environ["BINDIR"] = \
1474 os.path.join(self._installdir, "bin")
1474 os.path.join(self._installdir, "bin")
1475 self._tmpbindir = self._bindir
1475 self._tmpbindir = self._bindir
1476 self._pythondir = os.path.join(self._installdir, "lib", "python")
1476 self._pythondir = os.path.join(self._installdir, "lib", "python")
1477
1477
1478 os.environ["BINDIR"] = self._bindir
1478 os.environ["BINDIR"] = self._bindir
1479 os.environ["PYTHON"] = PYTHON
1479 os.environ["PYTHON"] = PYTHON
1480
1480
1481 path = [self._bindir] + os.environ["PATH"].split(os.pathsep)
1481 path = [self._bindir] + os.environ["PATH"].split(os.pathsep)
1482 if self._tmpbindir != self._bindir:
1482 if self._tmpbindir != self._bindir:
1483 path = [self._tmpbindir] + path
1483 path = [self._tmpbindir] + path
1484 os.environ["PATH"] = os.pathsep.join(path)
1484 os.environ["PATH"] = os.pathsep.join(path)
1485
1485
1486 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
1486 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
1487 # can run .../tests/run-tests.py test-foo where test-foo
1487 # can run .../tests/run-tests.py test-foo where test-foo
1488 # adds an extension to HGRC. Also include run-test.py directory to
1488 # adds an extension to HGRC. Also include run-test.py directory to
1489 # import modules like heredoctest.
1489 # import modules like heredoctest.
1490 pypath = [self._pythondir, self._testdir,
1490 pypath = [self._pythondir, self._testdir,
1491 os.path.abspath(os.path.dirname(__file__))]
1491 os.path.abspath(os.path.dirname(__file__))]
1492 # We have to augment PYTHONPATH, rather than simply replacing
1492 # We have to augment PYTHONPATH, rather than simply replacing
1493 # it, in case external libraries are only available via current
1493 # it, in case external libraries are only available via current
1494 # PYTHONPATH. (In particular, the Subversion bindings on OS X
1494 # PYTHONPATH. (In particular, the Subversion bindings on OS X
1495 # are in /opt/subversion.)
1495 # are in /opt/subversion.)
1496 oldpypath = os.environ.get(IMPL_PATH)
1496 oldpypath = os.environ.get(IMPL_PATH)
1497 if oldpypath:
1497 if oldpypath:
1498 pypath.append(oldpypath)
1498 pypath.append(oldpypath)
1499 os.environ[IMPL_PATH] = os.pathsep.join(pypath)
1499 os.environ[IMPL_PATH] = os.pathsep.join(pypath)
1500
1500
1501 self._coveragefile = os.path.join(self._testdir, '.coverage')
1501 self._coveragefile = os.path.join(self._testdir, '.coverage')
1502
1502
1503 vlog("# Using TESTDIR", self._testdir)
1503 vlog("# Using TESTDIR", self._testdir)
1504 vlog("# Using HGTMP", self._hgtmp)
1504 vlog("# Using HGTMP", self._hgtmp)
1505 vlog("# Using PATH", os.environ["PATH"])
1505 vlog("# Using PATH", os.environ["PATH"])
1506 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
1506 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
1507
1507
1508 try:
1508 try:
1509 return self._runtests(tests) or 0
1509 return self._runtests(tests) or 0
1510 finally:
1510 finally:
1511 time.sleep(.1)
1511 time.sleep(.1)
1512 self._cleanup()
1512 self._cleanup()
1513
1513
1514 def findtests(self, args):
1514 def findtests(self, args):
1515 """Finds possible test files from arguments.
1515 """Finds possible test files from arguments.
1516
1516
1517 If you wish to inject custom tests into the test harness, this would
1517 If you wish to inject custom tests into the test harness, this would
1518 be a good function to monkeypatch or override in a derived class.
1518 be a good function to monkeypatch or override in a derived class.
1519 """
1519 """
1520 if not args:
1520 if not args:
1521 if self.options.changed:
1521 if self.options.changed:
1522 proc = Popen4('hg st --rev "%s" -man0 .' %
1522 proc = Popen4('hg st --rev "%s" -man0 .' %
1523 self.options.changed, None, 0)
1523 self.options.changed, None, 0)
1524 stdout, stderr = proc.communicate()
1524 stdout, stderr = proc.communicate()
1525 args = stdout.strip('\0').split('\0')
1525 args = stdout.strip('\0').split('\0')
1526 else:
1526 else:
1527 args = os.listdir('.')
1527 args = os.listdir('.')
1528
1528
1529 return [t for t in args
1529 return [t for t in args
1530 if os.path.basename(t).startswith('test-')
1530 if os.path.basename(t).startswith('test-')
1531 and (t.endswith('.py') or t.endswith('.t'))]
1531 and (t.endswith('.py') or t.endswith('.t'))]
1532
1532
1533 def _runtests(self, tests):
1533 def _runtests(self, tests):
1534 try:
1534 try:
1535 if self._installdir:
1535 if self._installdir:
1536 self._installhg()
1536 self._installhg()
1537 self._checkhglib("Testing")
1537 self._checkhglib("Testing")
1538 else:
1538 else:
1539 self._usecorrectpython()
1539 self._usecorrectpython()
1540
1540
1541 if self.options.restart:
1541 if self.options.restart:
1542 orig = list(tests)
1542 orig = list(tests)
1543 while tests:
1543 while tests:
1544 if os.path.exists(tests[0] + ".err"):
1544 if os.path.exists(tests[0] + ".err"):
1545 break
1545 break
1546 tests.pop(0)
1546 tests.pop(0)
1547 if not tests:
1547 if not tests:
1548 print "running all tests"
1548 print "running all tests"
1549 tests = orig
1549 tests = orig
1550
1550
1551 tests = [self._gettest(t, i) for i, t in enumerate(tests)]
1551 tests = [self._gettest(t, i) for i, t in enumerate(tests)]
1552
1552
1553 failed = False
1553 failed = False
1554 warned = False
1554 warned = False
1555
1555
1556 suite = TestSuite(self._testdir,
1556 suite = TestSuite(self._testdir,
1557 jobs=self.options.jobs,
1557 jobs=self.options.jobs,
1558 whitelist=self.options.whitelisted,
1558 whitelist=self.options.whitelisted,
1559 blacklist=self.options.blacklist,
1559 blacklist=self.options.blacklist,
1560 retest=self.options.retest,
1560 retest=self.options.retest,
1561 keywords=self.options.keywords,
1561 keywords=self.options.keywords,
1562 loop=self.options.loop,
1562 loop=self.options.loop,
1563 tests=tests)
1563 tests=tests)
1564 verbosity = 1
1564 verbosity = 1
1565 if self.options.verbose:
1565 if self.options.verbose:
1566 verbosity = 2
1566 verbosity = 2
1567 runner = TextTestRunner(self, verbosity=verbosity)
1567 runner = TextTestRunner(self, verbosity=verbosity)
1568 result = runner.run(suite)
1568 result = runner.run(suite)
1569
1569
1570 if result.failures:
1570 if result.failures:
1571 failed = True
1571 failed = True
1572 if result.warned:
1572 if result.warned:
1573 warned = True
1573 warned = True
1574
1574
1575 if self.options.anycoverage:
1575 if self.options.anycoverage:
1576 self._outputcoverage()
1576 self._outputcoverage()
1577 except KeyboardInterrupt:
1577 except KeyboardInterrupt:
1578 failed = True
1578 failed = True
1579 print "\ninterrupted!"
1579 print "\ninterrupted!"
1580
1580
1581 if failed:
1581 if failed:
1582 return 1
1582 return 1
1583 if warned:
1583 if warned:
1584 return 80
1584 return 80
1585
1585
1586 def _gettest(self, test, count):
1586 def _gettest(self, test, count):
1587 """Obtain a Test by looking at its filename.
1587 """Obtain a Test by looking at its filename.
1588
1588
1589 Returns a Test instance. The Test may not be runnable if it doesn't
1589 Returns a Test instance. The Test may not be runnable if it doesn't
1590 map to a known type.
1590 map to a known type.
1591 """
1591 """
1592 lctest = test.lower()
1592 lctest = test.lower()
1593 testcls = Test
1593 testcls = Test
1594
1594
1595 for ext, cls in self.TESTTYPES:
1595 for ext, cls in self.TESTTYPES:
1596 if lctest.endswith(ext):
1596 if lctest.endswith(ext):
1597 testcls = cls
1597 testcls = cls
1598 break
1598 break
1599
1599
1600 refpath = os.path.join(self._testdir, test)
1600 refpath = os.path.join(self._testdir, test)
1601 tmpdir = os.path.join(self._hgtmp, 'child%d' % count)
1601 tmpdir = os.path.join(self._hgtmp, 'child%d' % count)
1602
1602
1603 return testcls(refpath, tmpdir,
1603 return testcls(refpath, tmpdir,
1604 keeptmpdir=self.options.keep_tmpdir,
1604 keeptmpdir=self.options.keep_tmpdir,
1605 debug=self.options.debug,
1605 debug=self.options.debug,
1606 timeout=self.options.timeout,
1606 timeout=self.options.timeout,
1607 startport=self.options.port + count * 3,
1607 startport=self.options.port + count * 3,
1608 extraconfigopts=self.options.extra_config_opt,
1608 extraconfigopts=self.options.extra_config_opt,
1609 py3kwarnings=self.options.py3k_warnings,
1609 py3kwarnings=self.options.py3k_warnings,
1610 shell=self.options.shell)
1610 shell=self.options.shell)
1611
1611
1612 def _cleanup(self):
1612 def _cleanup(self):
1613 """Clean up state from this test invocation."""
1613 """Clean up state from this test invocation."""
1614
1614
1615 if self.options.keep_tmpdir:
1615 if self.options.keep_tmpdir:
1616 return
1616 return
1617
1617
1618 vlog("# Cleaning up HGTMP", self._hgtmp)
1618 vlog("# Cleaning up HGTMP", self._hgtmp)
1619 shutil.rmtree(self._hgtmp, True)
1619 shutil.rmtree(self._hgtmp, True)
1620 for f in self._createdfiles:
1620 for f in self._createdfiles:
1621 try:
1621 try:
1622 os.remove(f)
1622 os.remove(f)
1623 except OSError:
1623 except OSError:
1624 pass
1624 pass
1625
1625
1626 def _usecorrectpython(self):
1626 def _usecorrectpython(self):
1627 """Configure the environment to use the appropriate Python in tests."""
1627 """Configure the environment to use the appropriate Python in tests."""
1628 # Tests must use the same interpreter as us or bad things will happen.
1628 # Tests must use the same interpreter as us or bad things will happen.
1629 pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
1629 pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
1630 if getattr(os, 'symlink', None):
1630 if getattr(os, 'symlink', None):
1631 vlog("# Making python executable in test path a symlink to '%s'" %
1631 vlog("# Making python executable in test path a symlink to '%s'" %
1632 sys.executable)
1632 sys.executable)
1633 mypython = os.path.join(self._tmpbindir, pyexename)
1633 mypython = os.path.join(self._tmpbindir, pyexename)
1634 try:
1634 try:
1635 if os.readlink(mypython) == sys.executable:
1635 if os.readlink(mypython) == sys.executable:
1636 return
1636 return
1637 os.unlink(mypython)
1637 os.unlink(mypython)
1638 except OSError, err:
1638 except OSError, err:
1639 if err.errno != errno.ENOENT:
1639 if err.errno != errno.ENOENT:
1640 raise
1640 raise
1641 if self._findprogram(pyexename) != sys.executable:
1641 if self._findprogram(pyexename) != sys.executable:
1642 try:
1642 try:
1643 os.symlink(sys.executable, mypython)
1643 os.symlink(sys.executable, mypython)
1644 self._createdfiles.append(mypython)
1644 self._createdfiles.append(mypython)
1645 except OSError, err:
1645 except OSError, err:
1646 # child processes may race, which is harmless
1646 # child processes may race, which is harmless
1647 if err.errno != errno.EEXIST:
1647 if err.errno != errno.EEXIST:
1648 raise
1648 raise
1649 else:
1649 else:
1650 exedir, exename = os.path.split(sys.executable)
1650 exedir, exename = os.path.split(sys.executable)
1651 vlog("# Modifying search path to find %s as %s in '%s'" %
1651 vlog("# Modifying search path to find %s as %s in '%s'" %
1652 (exename, pyexename, exedir))
1652 (exename, pyexename, exedir))
1653 path = os.environ['PATH'].split(os.pathsep)
1653 path = os.environ['PATH'].split(os.pathsep)
1654 while exedir in path:
1654 while exedir in path:
1655 path.remove(exedir)
1655 path.remove(exedir)
1656 os.environ['PATH'] = os.pathsep.join([exedir] + path)
1656 os.environ['PATH'] = os.pathsep.join([exedir] + path)
1657 if not self._findprogram(pyexename):
1657 if not self._findprogram(pyexename):
1658 print "WARNING: Cannot find %s in search path" % pyexename
1658 print "WARNING: Cannot find %s in search path" % pyexename
1659
1659
1660 def _installhg(self):
1660 def _installhg(self):
1661 """Install hg into the test environment.
1661 """Install hg into the test environment.
1662
1662
1663 This will also configure hg with the appropriate testing settings.
1663 This will also configure hg with the appropriate testing settings.
1664 """
1664 """
1665 vlog("# Performing temporary installation of HG")
1665 vlog("# Performing temporary installation of HG")
1666 installerrs = os.path.join("tests", "install.err")
1666 installerrs = os.path.join("tests", "install.err")
1667 compiler = ''
1667 compiler = ''
1668 if self.options.compiler:
1668 if self.options.compiler:
1669 compiler = '--compiler ' + self.options.compiler
1669 compiler = '--compiler ' + self.options.compiler
1670 pure = self.options.pure and "--pure" or ""
1670 pure = self.options.pure and "--pure" or ""
1671 py3 = ''
1671 py3 = ''
1672 if sys.version_info[0] == 3:
1672 if sys.version_info[0] == 3:
1673 py3 = '--c2to3'
1673 py3 = '--c2to3'
1674
1674
1675 # Run installer in hg root
1675 # Run installer in hg root
1676 script = os.path.realpath(sys.argv[0])
1676 script = os.path.realpath(sys.argv[0])
1677 hgroot = os.path.dirname(os.path.dirname(script))
1677 hgroot = os.path.dirname(os.path.dirname(script))
1678 os.chdir(hgroot)
1678 os.chdir(hgroot)
1679 nohome = '--home=""'
1679 nohome = '--home=""'
1680 if os.name == 'nt':
1680 if os.name == 'nt':
1681 # The --home="" trick works only on OS where os.sep == '/'
1681 # The --home="" trick works only on OS where os.sep == '/'
1682 # because of a distutils convert_path() fast-path. Avoid it at
1682 # because of a distutils convert_path() fast-path. Avoid it at
1683 # least on Windows for now, deal with .pydistutils.cfg bugs
1683 # least on Windows for now, deal with .pydistutils.cfg bugs
1684 # when they happen.
1684 # when they happen.
1685 nohome = ''
1685 nohome = ''
1686 cmd = ('%(exe)s setup.py %(py3)s %(pure)s clean --all'
1686 cmd = ('%(exe)s setup.py %(py3)s %(pure)s clean --all'
1687 ' build %(compiler)s --build-base="%(base)s"'
1687 ' build %(compiler)s --build-base="%(base)s"'
1688 ' install --force --prefix="%(prefix)s"'
1688 ' install --force --prefix="%(prefix)s"'
1689 ' --install-lib="%(libdir)s"'
1689 ' --install-lib="%(libdir)s"'
1690 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
1690 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
1691 % {'exe': sys.executable, 'py3': py3, 'pure': pure,
1691 % {'exe': sys.executable, 'py3': py3, 'pure': pure,
1692 'compiler': compiler,
1692 'compiler': compiler,
1693 'base': os.path.join(self._hgtmp, "build"),
1693 'base': os.path.join(self._hgtmp, "build"),
1694 'prefix': self._installdir, 'libdir': self._pythondir,
1694 'prefix': self._installdir, 'libdir': self._pythondir,
1695 'bindir': self._bindir,
1695 'bindir': self._bindir,
1696 'nohome': nohome, 'logfile': installerrs})
1696 'nohome': nohome, 'logfile': installerrs})
1697 vlog("# Running", cmd)
1697 vlog("# Running", cmd)
1698 if os.system(cmd) == 0:
1698 if os.system(cmd) == 0:
1699 if not self.options.verbose:
1699 if not self.options.verbose:
1700 os.remove(installerrs)
1700 os.remove(installerrs)
1701 else:
1701 else:
1702 f = open(installerrs, 'rb')
1702 f = open(installerrs, 'rb')
1703 for line in f:
1703 for line in f:
1704 print line,
1704 print line,
1705 f.close()
1705 f.close()
1706 sys.exit(1)
1706 sys.exit(1)
1707 os.chdir(self._testdir)
1707 os.chdir(self._testdir)
1708
1708
1709 self._usecorrectpython()
1709 self._usecorrectpython()
1710
1710
1711 if self.options.py3k_warnings and not self.options.anycoverage:
1711 if self.options.py3k_warnings and not self.options.anycoverage:
1712 vlog("# Updating hg command to enable Py3k Warnings switch")
1712 vlog("# Updating hg command to enable Py3k Warnings switch")
1713 f = open(os.path.join(self._bindir, 'hg'), 'rb')
1713 f = open(os.path.join(self._bindir, 'hg'), 'rb')
1714 lines = [line.rstrip() for line in f]
1714 lines = [line.rstrip() for line in f]
1715 lines[0] += ' -3'
1715 lines[0] += ' -3'
1716 f.close()
1716 f.close()
1717 f = open(os.path.join(self._bindir, 'hg'), 'wb')
1717 f = open(os.path.join(self._bindir, 'hg'), 'wb')
1718 for line in lines:
1718 for line in lines:
1719 f.write(line + '\n')
1719 f.write(line + '\n')
1720 f.close()
1720 f.close()
1721
1721
1722 hgbat = os.path.join(self._bindir, 'hg.bat')
1722 hgbat = os.path.join(self._bindir, 'hg.bat')
1723 if os.path.isfile(hgbat):
1723 if os.path.isfile(hgbat):
1724 # hg.bat expects to be put in bin/scripts while run-tests.py
1724 # hg.bat expects to be put in bin/scripts while run-tests.py
1725 # installation layout put it in bin/ directly. Fix it
1725 # installation layout put it in bin/ directly. Fix it
1726 f = open(hgbat, 'rb')
1726 f = open(hgbat, 'rb')
1727 data = f.read()
1727 data = f.read()
1728 f.close()
1728 f.close()
1729 if '"%~dp0..\python" "%~dp0hg" %*' in data:
1729 if '"%~dp0..\python" "%~dp0hg" %*' in data:
1730 data = data.replace('"%~dp0..\python" "%~dp0hg" %*',
1730 data = data.replace('"%~dp0..\python" "%~dp0hg" %*',
1731 '"%~dp0python" "%~dp0hg" %*')
1731 '"%~dp0python" "%~dp0hg" %*')
1732 f = open(hgbat, 'wb')
1732 f = open(hgbat, 'wb')
1733 f.write(data)
1733 f.write(data)
1734 f.close()
1734 f.close()
1735 else:
1735 else:
1736 print 'WARNING: cannot fix hg.bat reference to python.exe'
1736 print 'WARNING: cannot fix hg.bat reference to python.exe'
1737
1737
1738 if self.options.anycoverage:
1738 if self.options.anycoverage:
1739 custom = os.path.join(self._testdir, 'sitecustomize.py')
1739 custom = os.path.join(self._testdir, 'sitecustomize.py')
1740 target = os.path.join(self._pythondir, 'sitecustomize.py')
1740 target = os.path.join(self._pythondir, 'sitecustomize.py')
1741 vlog('# Installing coverage trigger to %s' % target)
1741 vlog('# Installing coverage trigger to %s' % target)
1742 shutil.copyfile(custom, target)
1742 shutil.copyfile(custom, target)
1743 rc = os.path.join(self._testdir, '.coveragerc')
1743 rc = os.path.join(self._testdir, '.coveragerc')
1744 vlog('# Installing coverage rc to %s' % rc)
1744 vlog('# Installing coverage rc to %s' % rc)
1745 os.environ['COVERAGE_PROCESS_START'] = rc
1745 os.environ['COVERAGE_PROCESS_START'] = rc
1746 fn = os.path.join(self._installdir, '..', '.coverage')
1746 fn = os.path.join(self._installdir, '..', '.coverage')
1747 os.environ['COVERAGE_FILE'] = fn
1747 os.environ['COVERAGE_FILE'] = fn
1748
1748
1749 def _checkhglib(self, verb):
1749 def _checkhglib(self, verb):
1750 """Ensure that the 'mercurial' package imported by python is
1750 """Ensure that the 'mercurial' package imported by python is
1751 the one we expect it to be. If not, print a warning to stderr."""
1751 the one we expect it to be. If not, print a warning to stderr."""
1752 if ((self._bindir == self._pythondir) and
1752 if ((self._bindir == self._pythondir) and
1753 (self._bindir != self._tmpbindir)):
1753 (self._bindir != self._tmpbindir)):
1754 # The pythondir has been infered from --with-hg flag.
1754 # The pythondir has been infered from --with-hg flag.
1755 # We cannot expect anything sensible here
1755 # We cannot expect anything sensible here
1756 return
1756 return
1757 expecthg = os.path.join(self._pythondir, 'mercurial')
1757 expecthg = os.path.join(self._pythondir, 'mercurial')
1758 actualhg = self._gethgpath()
1758 actualhg = self._gethgpath()
1759 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
1759 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
1760 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
1760 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
1761 ' (expected %s)\n'
1761 ' (expected %s)\n'
1762 % (verb, actualhg, expecthg))
1762 % (verb, actualhg, expecthg))
1763 def _gethgpath(self):
1763 def _gethgpath(self):
1764 """Return the path to the mercurial package that is actually found by
1764 """Return the path to the mercurial package that is actually found by
1765 the current Python interpreter."""
1765 the current Python interpreter."""
1766 if self._hgpath is not None:
1766 if self._hgpath is not None:
1767 return self._hgpath
1767 return self._hgpath
1768
1768
1769 cmd = '%s -c "import mercurial; print (mercurial.__path__[0])"'
1769 cmd = '%s -c "import mercurial; print (mercurial.__path__[0])"'
1770 pipe = os.popen(cmd % PYTHON)
1770 pipe = os.popen(cmd % PYTHON)
1771 try:
1771 try:
1772 self._hgpath = pipe.read().strip()
1772 self._hgpath = pipe.read().strip()
1773 finally:
1773 finally:
1774 pipe.close()
1774 pipe.close()
1775
1775
1776 return self._hgpath
1776 return self._hgpath
1777
1777
1778 def _outputcoverage(self):
1778 def _outputcoverage(self):
1779 """Produce code coverage output."""
1779 """Produce code coverage output."""
1780 vlog('# Producing coverage report')
1780 vlog('# Producing coverage report')
1781 os.chdir(self._pythondir)
1781 os.chdir(self._pythondir)
1782
1782
1783 def covrun(*args):
1783 def covrun(*args):
1784 cmd = 'coverage %s' % ' '.join(args)
1784 cmd = 'coverage %s' % ' '.join(args)
1785 vlog('# Running: %s' % cmd)
1785 vlog('# Running: %s' % cmd)
1786 os.system(cmd)
1786 os.system(cmd)
1787
1787
1788 covrun('-c')
1788 covrun('-c')
1789 omit = ','.join(os.path.join(x, '*') for x in
1789 omit = ','.join(os.path.join(x, '*') for x in
1790 [self._bindir, self._testdir])
1790 [self._bindir, self._testdir])
1791 covrun('-i', '-r', '"--omit=%s"' % omit) # report
1791 covrun('-i', '-r', '"--omit=%s"' % omit) # report
1792 if self.options.htmlcov:
1792 if self.options.htmlcov:
1793 htmldir = os.path.join(self._testdir, 'htmlcov')
1793 htmldir = os.path.join(self._testdir, 'htmlcov')
1794 covrun('-i', '-b', '"--directory=%s"' % htmldir,
1794 covrun('-i', '-b', '"--directory=%s"' % htmldir,
1795 '"--omit=%s"' % omit)
1795 '"--omit=%s"' % omit)
1796 if self.options.annotate:
1796 if self.options.annotate:
1797 adir = os.path.join(self._testdir, 'annotated')
1797 adir = os.path.join(self._testdir, 'annotated')
1798 if not os.path.isdir(adir):
1798 if not os.path.isdir(adir):
1799 os.mkdir(adir)
1799 os.mkdir(adir)
1800 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
1800 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
1801
1801
1802 def _findprogram(self, program):
1802 def _findprogram(self, program):
1803 """Search PATH for a executable program"""
1803 """Search PATH for a executable program"""
1804 for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
1804 for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
1805 name = os.path.join(p, program)
1805 name = os.path.join(p, program)
1806 if os.name == 'nt' or os.access(name, os.X_OK):
1806 if os.name == 'nt' or os.access(name, os.X_OK):
1807 return name
1807 return name
1808 return None
1808 return None
1809
1809
1810 def _checktools(self):
1810 def _checktools(self):
1811 """Ensure tools required to run tests are present."""
1811 """Ensure tools required to run tests are present."""
1812 for p in self.REQUIREDTOOLS:
1812 for p in self.REQUIREDTOOLS:
1813 if os.name == 'nt' and not p.endswith('.exe'):
1813 if os.name == 'nt' and not p.endswith('.exe'):
1814 p += '.exe'
1814 p += '.exe'
1815 found = self._findprogram(p)
1815 found = self._findprogram(p)
1816 if found:
1816 if found:
1817 vlog("# Found prerequisite", p, "at", found)
1817 vlog("# Found prerequisite", p, "at", found)
1818 else:
1818 else:
1819 print "WARNING: Did not find prerequisite tool: %s " % p
1819 print "WARNING: Did not find prerequisite tool: %s " % p
1820
1820
1821 if __name__ == '__main__':
1821 if __name__ == '__main__':
1822 runner = TestRunner()
1822 runner = TestRunner()
1823
1824 try:
1825 import msvcrt
1826 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
1827 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
1828 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
1829 except ImportError:
1830 pass
1831
1823 sys.exit(runner.run(sys.argv[1:]))
1832 sys.exit(runner.run(sys.argv[1:]))
General Comments 0
You need to be logged in to leave comments. Login now