##// END OF EJS Templates
run-tests: skip threading for a single test...
timeless -
r27689:50e621fe default
parent child Browse files
Show More
@@ -1,2376 +1,2380
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 # 10) parallel, pure, tests that call run-tests:
38 # 10) parallel, pure, tests that call run-tests:
39 # ./run-tests.py --pure `grep -l run-tests.py *.t`
39 # ./run-tests.py --pure `grep -l run-tests.py *.t`
40 #
40 #
41 # (You could use any subset of the tests: test-s* happens to match
41 # (You could use any subset of the tests: test-s* happens to match
42 # enough that it's worth doing parallel runs, few enough that it
42 # enough that it's worth doing parallel runs, few enough that it
43 # completes fairly quickly, includes both shell and Python scripts, and
43 # completes fairly quickly, includes both shell and Python scripts, and
44 # includes some scripts that run daemon processes.)
44 # includes some scripts that run daemon processes.)
45
45
46 from __future__ import print_function
46 from __future__ import print_function
47
47
48 from distutils import version
48 from distutils import version
49 import difflib
49 import difflib
50 import errno
50 import errno
51 import optparse
51 import optparse
52 import os
52 import os
53 import shutil
53 import shutil
54 import subprocess
54 import subprocess
55 import signal
55 import signal
56 import socket
56 import socket
57 import sys
57 import sys
58 import tempfile
58 import tempfile
59 import time
59 import time
60 import random
60 import random
61 import re
61 import re
62 import threading
62 import threading
63 import killdaemons as killmod
63 import killdaemons as killmod
64 try:
64 try:
65 import Queue as queue
65 import Queue as queue
66 except ImportError:
66 except ImportError:
67 import queue
67 import queue
68 from xml.dom import minidom
68 from xml.dom import minidom
69 import unittest
69 import unittest
70
70
71 osenvironb = getattr(os, 'environb', os.environ)
71 osenvironb = getattr(os, 'environb', os.environ)
72
72
73 try:
73 try:
74 import json
74 import json
75 except ImportError:
75 except ImportError:
76 try:
76 try:
77 import simplejson as json
77 import simplejson as json
78 except ImportError:
78 except ImportError:
79 json = None
79 json = None
80
80
81 processlock = threading.Lock()
81 processlock = threading.Lock()
82
82
83 if sys.version_info > (3, 5, 0):
83 if sys.version_info > (3, 5, 0):
84 PYTHON3 = True
84 PYTHON3 = True
85 xrange = range # we use xrange in one place, and we'd rather not use range
85 xrange = range # we use xrange in one place, and we'd rather not use range
86 def _bytespath(p):
86 def _bytespath(p):
87 return p.encode('utf-8')
87 return p.encode('utf-8')
88
88
89 def _strpath(p):
89 def _strpath(p):
90 return p.decode('utf-8')
90 return p.decode('utf-8')
91
91
92 elif sys.version_info >= (3, 0, 0):
92 elif sys.version_info >= (3, 0, 0):
93 print('%s is only supported on Python 3.5+ and 2.6-2.7, not %s' %
93 print('%s is only supported on Python 3.5+ and 2.6-2.7, not %s' %
94 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
94 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
95 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
95 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
96 else:
96 else:
97 PYTHON3 = False
97 PYTHON3 = False
98
98
99 # In python 2.x, path operations are generally done using
99 # In python 2.x, path operations are generally done using
100 # bytestrings by default, so we don't have to do any extra
100 # bytestrings by default, so we don't have to do any extra
101 # fiddling there. We define the wrapper functions anyway just to
101 # fiddling there. We define the wrapper functions anyway just to
102 # help keep code consistent between platforms.
102 # help keep code consistent between platforms.
103 def _bytespath(p):
103 def _bytespath(p):
104 return p
104 return p
105
105
106 _strpath = _bytespath
106 _strpath = _bytespath
107
107
108 # For Windows support
108 # For Windows support
109 wifexited = getattr(os, "WIFEXITED", lambda x: False)
109 wifexited = getattr(os, "WIFEXITED", lambda x: False)
110
110
111 def checkportisavailable(port):
111 def checkportisavailable(port):
112 """return true if a port seems free to bind on localhost"""
112 """return true if a port seems free to bind on localhost"""
113 try:
113 try:
114 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
114 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
115 s.bind(('localhost', port))
115 s.bind(('localhost', port))
116 s.close()
116 s.close()
117 return True
117 return True
118 except socket.error as exc:
118 except socket.error as exc:
119 if not exc.errno == errno.EADDRINUSE:
119 if not exc.errno == errno.EADDRINUSE:
120 raise
120 raise
121 return False
121 return False
122
122
123 closefds = os.name == 'posix'
123 closefds = os.name == 'posix'
124 def Popen4(cmd, wd, timeout, env=None):
124 def Popen4(cmd, wd, timeout, env=None):
125 processlock.acquire()
125 processlock.acquire()
126 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
126 p = subprocess.Popen(cmd, shell=True, bufsize=-1, cwd=wd, env=env,
127 close_fds=closefds,
127 close_fds=closefds,
128 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
128 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
129 stderr=subprocess.STDOUT)
129 stderr=subprocess.STDOUT)
130 processlock.release()
130 processlock.release()
131
131
132 p.fromchild = p.stdout
132 p.fromchild = p.stdout
133 p.tochild = p.stdin
133 p.tochild = p.stdin
134 p.childerr = p.stderr
134 p.childerr = p.stderr
135
135
136 p.timeout = False
136 p.timeout = False
137 if timeout:
137 if timeout:
138 def t():
138 def t():
139 start = time.time()
139 start = time.time()
140 while time.time() - start < timeout and p.returncode is None:
140 while time.time() - start < timeout and p.returncode is None:
141 time.sleep(.1)
141 time.sleep(.1)
142 p.timeout = True
142 p.timeout = True
143 if p.returncode is None:
143 if p.returncode is None:
144 terminate(p)
144 terminate(p)
145 threading.Thread(target=t).start()
145 threading.Thread(target=t).start()
146
146
147 return p
147 return p
148
148
149 PYTHON = _bytespath(sys.executable.replace('\\', '/'))
149 PYTHON = _bytespath(sys.executable.replace('\\', '/'))
150 IMPL_PATH = b'PYTHONPATH'
150 IMPL_PATH = b'PYTHONPATH'
151 if 'java' in sys.platform:
151 if 'java' in sys.platform:
152 IMPL_PATH = b'JYTHONPATH'
152 IMPL_PATH = b'JYTHONPATH'
153
153
154 defaults = {
154 defaults = {
155 'jobs': ('HGTEST_JOBS', 1),
155 'jobs': ('HGTEST_JOBS', 1),
156 'timeout': ('HGTEST_TIMEOUT', 180),
156 'timeout': ('HGTEST_TIMEOUT', 180),
157 'slowtimeout': ('HGTEST_SLOWTIMEOUT', 500),
157 'slowtimeout': ('HGTEST_SLOWTIMEOUT', 500),
158 'port': ('HGTEST_PORT', 20059),
158 'port': ('HGTEST_PORT', 20059),
159 'shell': ('HGTEST_SHELL', 'sh'),
159 'shell': ('HGTEST_SHELL', 'sh'),
160 }
160 }
161
161
162 def parselistfiles(files, listtype, warn=True):
162 def parselistfiles(files, listtype, warn=True):
163 entries = dict()
163 entries = dict()
164 for filename in files:
164 for filename in files:
165 try:
165 try:
166 path = os.path.expanduser(os.path.expandvars(filename))
166 path = os.path.expanduser(os.path.expandvars(filename))
167 f = open(path, "rb")
167 f = open(path, "rb")
168 except IOError as err:
168 except IOError as err:
169 if err.errno != errno.ENOENT:
169 if err.errno != errno.ENOENT:
170 raise
170 raise
171 if warn:
171 if warn:
172 print("warning: no such %s file: %s" % (listtype, filename))
172 print("warning: no such %s file: %s" % (listtype, filename))
173 continue
173 continue
174
174
175 for line in f.readlines():
175 for line in f.readlines():
176 line = line.split(b'#', 1)[0].strip()
176 line = line.split(b'#', 1)[0].strip()
177 if line:
177 if line:
178 entries[line] = filename
178 entries[line] = filename
179
179
180 f.close()
180 f.close()
181 return entries
181 return entries
182
182
183 def getparser():
183 def getparser():
184 """Obtain the OptionParser used by the CLI."""
184 """Obtain the OptionParser used by the CLI."""
185 parser = optparse.OptionParser("%prog [options] [tests]")
185 parser = optparse.OptionParser("%prog [options] [tests]")
186
186
187 # keep these sorted
187 # keep these sorted
188 parser.add_option("--blacklist", action="append",
188 parser.add_option("--blacklist", action="append",
189 help="skip tests listed in the specified blacklist file")
189 help="skip tests listed in the specified blacklist file")
190 parser.add_option("--whitelist", action="append",
190 parser.add_option("--whitelist", action="append",
191 help="always run tests listed in the specified whitelist file")
191 help="always run tests listed in the specified whitelist file")
192 parser.add_option("--changed", type="string",
192 parser.add_option("--changed", type="string",
193 help="run tests that are changed in parent rev or working directory")
193 help="run tests that are changed in parent rev or working directory")
194 parser.add_option("-C", "--annotate", action="store_true",
194 parser.add_option("-C", "--annotate", action="store_true",
195 help="output files annotated with coverage")
195 help="output files annotated with coverage")
196 parser.add_option("-c", "--cover", action="store_true",
196 parser.add_option("-c", "--cover", action="store_true",
197 help="print a test coverage report")
197 help="print a test coverage report")
198 parser.add_option("-d", "--debug", action="store_true",
198 parser.add_option("-d", "--debug", action="store_true",
199 help="debug mode: write output of test scripts to console"
199 help="debug mode: write output of test scripts to console"
200 " rather than capturing and diffing it (disables timeout)")
200 " rather than capturing and diffing it (disables timeout)")
201 parser.add_option("-f", "--first", action="store_true",
201 parser.add_option("-f", "--first", action="store_true",
202 help="exit on the first test failure")
202 help="exit on the first test failure")
203 parser.add_option("-H", "--htmlcov", action="store_true",
203 parser.add_option("-H", "--htmlcov", action="store_true",
204 help="create an HTML report of the coverage of the files")
204 help="create an HTML report of the coverage of the files")
205 parser.add_option("-i", "--interactive", action="store_true",
205 parser.add_option("-i", "--interactive", action="store_true",
206 help="prompt to accept changed output")
206 help="prompt to accept changed output")
207 parser.add_option("-j", "--jobs", type="int",
207 parser.add_option("-j", "--jobs", type="int",
208 help="number of jobs to run in parallel"
208 help="number of jobs to run in parallel"
209 " (default: $%s or %d)" % defaults['jobs'])
209 " (default: $%s or %d)" % defaults['jobs'])
210 parser.add_option("--keep-tmpdir", action="store_true",
210 parser.add_option("--keep-tmpdir", action="store_true",
211 help="keep temporary directory after running tests")
211 help="keep temporary directory after running tests")
212 parser.add_option("-k", "--keywords",
212 parser.add_option("-k", "--keywords",
213 help="run tests matching keywords")
213 help="run tests matching keywords")
214 parser.add_option("-l", "--local", action="store_true",
214 parser.add_option("-l", "--local", action="store_true",
215 help="shortcut for --with-hg=<testdir>/../hg")
215 help="shortcut for --with-hg=<testdir>/../hg")
216 parser.add_option("--loop", action="store_true",
216 parser.add_option("--loop", action="store_true",
217 help="loop tests repeatedly")
217 help="loop tests repeatedly")
218 parser.add_option("--runs-per-test", type="int", dest="runs_per_test",
218 parser.add_option("--runs-per-test", type="int", dest="runs_per_test",
219 help="run each test N times (default=1)", default=1)
219 help="run each test N times (default=1)", default=1)
220 parser.add_option("-n", "--nodiff", action="store_true",
220 parser.add_option("-n", "--nodiff", action="store_true",
221 help="skip showing test changes")
221 help="skip showing test changes")
222 parser.add_option("-p", "--port", type="int",
222 parser.add_option("-p", "--port", type="int",
223 help="port on which servers should listen"
223 help="port on which servers should listen"
224 " (default: $%s or %d)" % defaults['port'])
224 " (default: $%s or %d)" % defaults['port'])
225 parser.add_option("--compiler", type="string",
225 parser.add_option("--compiler", type="string",
226 help="compiler to build with")
226 help="compiler to build with")
227 parser.add_option("--pure", action="store_true",
227 parser.add_option("--pure", action="store_true",
228 help="use pure Python code instead of C extensions")
228 help="use pure Python code instead of C extensions")
229 parser.add_option("-R", "--restart", action="store_true",
229 parser.add_option("-R", "--restart", action="store_true",
230 help="restart at last error")
230 help="restart at last error")
231 parser.add_option("-r", "--retest", action="store_true",
231 parser.add_option("-r", "--retest", action="store_true",
232 help="retest failed tests")
232 help="retest failed tests")
233 parser.add_option("-S", "--noskips", action="store_true",
233 parser.add_option("-S", "--noskips", action="store_true",
234 help="don't report skip tests verbosely")
234 help="don't report skip tests verbosely")
235 parser.add_option("--shell", type="string",
235 parser.add_option("--shell", type="string",
236 help="shell to use (default: $%s or %s)" % defaults['shell'])
236 help="shell to use (default: $%s or %s)" % defaults['shell'])
237 parser.add_option("-t", "--timeout", type="int",
237 parser.add_option("-t", "--timeout", type="int",
238 help="kill errant tests after TIMEOUT seconds"
238 help="kill errant tests after TIMEOUT seconds"
239 " (default: $%s or %d)" % defaults['timeout'])
239 " (default: $%s or %d)" % defaults['timeout'])
240 parser.add_option("--slowtimeout", type="int",
240 parser.add_option("--slowtimeout", type="int",
241 help="kill errant slow tests after SLOWTIMEOUT seconds"
241 help="kill errant slow tests after SLOWTIMEOUT seconds"
242 " (default: $%s or %d)" % defaults['slowtimeout'])
242 " (default: $%s or %d)" % defaults['slowtimeout'])
243 parser.add_option("--time", action="store_true",
243 parser.add_option("--time", action="store_true",
244 help="time how long each test takes")
244 help="time how long each test takes")
245 parser.add_option("--json", action="store_true",
245 parser.add_option("--json", action="store_true",
246 help="store test result data in 'report.json' file")
246 help="store test result data in 'report.json' file")
247 parser.add_option("--tmpdir", type="string",
247 parser.add_option("--tmpdir", type="string",
248 help="run tests in the given temporary directory"
248 help="run tests in the given temporary directory"
249 " (implies --keep-tmpdir)")
249 " (implies --keep-tmpdir)")
250 parser.add_option("-v", "--verbose", action="store_true",
250 parser.add_option("-v", "--verbose", action="store_true",
251 help="output verbose messages")
251 help="output verbose messages")
252 parser.add_option("--xunit", type="string",
252 parser.add_option("--xunit", type="string",
253 help="record xunit results at specified path")
253 help="record xunit results at specified path")
254 parser.add_option("--view", type="string",
254 parser.add_option("--view", type="string",
255 help="external diff viewer")
255 help="external diff viewer")
256 parser.add_option("--with-hg", type="string",
256 parser.add_option("--with-hg", type="string",
257 metavar="HG",
257 metavar="HG",
258 help="test using specified hg script rather than a "
258 help="test using specified hg script rather than a "
259 "temporary installation")
259 "temporary installation")
260 parser.add_option("-3", "--py3k-warnings", action="store_true",
260 parser.add_option("-3", "--py3k-warnings", action="store_true",
261 help="enable Py3k warnings on Python 2.6+")
261 help="enable Py3k warnings on Python 2.6+")
262 parser.add_option('--extra-config-opt', action="append",
262 parser.add_option('--extra-config-opt', action="append",
263 help='set the given config opt in the test hgrc')
263 help='set the given config opt in the test hgrc')
264 parser.add_option('--random', action="store_true",
264 parser.add_option('--random', action="store_true",
265 help='run tests in random order')
265 help='run tests in random order')
266 parser.add_option('--profile-runner', action='store_true',
266 parser.add_option('--profile-runner', action='store_true',
267 help='run statprof on run-tests')
267 help='run statprof on run-tests')
268 parser.add_option('--allow-slow-tests', action='store_true',
268 parser.add_option('--allow-slow-tests', action='store_true',
269 help='allow extremely slow tests')
269 help='allow extremely slow tests')
270 parser.add_option('--showchannels', action='store_true',
270 parser.add_option('--showchannels', action='store_true',
271 help='show scheduling channels')
271 help='show scheduling channels')
272
272
273 for option, (envvar, default) in defaults.items():
273 for option, (envvar, default) in defaults.items():
274 defaults[option] = type(default)(os.environ.get(envvar, default))
274 defaults[option] = type(default)(os.environ.get(envvar, default))
275 parser.set_defaults(**defaults)
275 parser.set_defaults(**defaults)
276
276
277 return parser
277 return parser
278
278
279 def parseargs(args, parser):
279 def parseargs(args, parser):
280 """Parse arguments with our OptionParser and validate results."""
280 """Parse arguments with our OptionParser and validate results."""
281 (options, args) = parser.parse_args(args)
281 (options, args) = parser.parse_args(args)
282
282
283 # jython is always pure
283 # jython is always pure
284 if 'java' in sys.platform or '__pypy__' in sys.modules:
284 if 'java' in sys.platform or '__pypy__' in sys.modules:
285 options.pure = True
285 options.pure = True
286
286
287 if options.with_hg:
287 if options.with_hg:
288 options.with_hg = os.path.expanduser(options.with_hg)
288 options.with_hg = os.path.expanduser(options.with_hg)
289 if not (os.path.isfile(options.with_hg) and
289 if not (os.path.isfile(options.with_hg) and
290 os.access(options.with_hg, os.X_OK)):
290 os.access(options.with_hg, os.X_OK)):
291 parser.error('--with-hg must specify an executable hg script')
291 parser.error('--with-hg must specify an executable hg script')
292 if not os.path.basename(options.with_hg) == 'hg':
292 if not os.path.basename(options.with_hg) == 'hg':
293 sys.stderr.write('warning: --with-hg should specify an hg script\n')
293 sys.stderr.write('warning: --with-hg should specify an hg script\n')
294 if options.local:
294 if options.local:
295 testdir = os.path.dirname(_bytespath(os.path.realpath(sys.argv[0])))
295 testdir = os.path.dirname(_bytespath(os.path.realpath(sys.argv[0])))
296 hgbin = os.path.join(os.path.dirname(testdir), b'hg')
296 hgbin = os.path.join(os.path.dirname(testdir), b'hg')
297 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
297 if os.name != 'nt' and not os.access(hgbin, os.X_OK):
298 parser.error('--local specified, but %r not found or not executable'
298 parser.error('--local specified, but %r not found or not executable'
299 % hgbin)
299 % hgbin)
300 options.with_hg = hgbin
300 options.with_hg = hgbin
301
301
302 options.anycoverage = options.cover or options.annotate or options.htmlcov
302 options.anycoverage = options.cover or options.annotate or options.htmlcov
303 if options.anycoverage:
303 if options.anycoverage:
304 try:
304 try:
305 import coverage
305 import coverage
306 covver = version.StrictVersion(coverage.__version__).version
306 covver = version.StrictVersion(coverage.__version__).version
307 if covver < (3, 3):
307 if covver < (3, 3):
308 parser.error('coverage options require coverage 3.3 or later')
308 parser.error('coverage options require coverage 3.3 or later')
309 except ImportError:
309 except ImportError:
310 parser.error('coverage options now require the coverage package')
310 parser.error('coverage options now require the coverage package')
311
311
312 if options.anycoverage and options.local:
312 if options.anycoverage and options.local:
313 # this needs some path mangling somewhere, I guess
313 # this needs some path mangling somewhere, I guess
314 parser.error("sorry, coverage options do not work when --local "
314 parser.error("sorry, coverage options do not work when --local "
315 "is specified")
315 "is specified")
316
316
317 if options.anycoverage and options.with_hg:
317 if options.anycoverage and options.with_hg:
318 parser.error("sorry, coverage options do not work when --with-hg "
318 parser.error("sorry, coverage options do not work when --with-hg "
319 "is specified")
319 "is specified")
320
320
321 global verbose
321 global verbose
322 if options.verbose:
322 if options.verbose:
323 verbose = ''
323 verbose = ''
324
324
325 if options.tmpdir:
325 if options.tmpdir:
326 options.tmpdir = os.path.expanduser(options.tmpdir)
326 options.tmpdir = os.path.expanduser(options.tmpdir)
327
327
328 if options.jobs < 1:
328 if options.jobs < 1:
329 parser.error('--jobs must be positive')
329 parser.error('--jobs must be positive')
330 if options.interactive and options.debug:
330 if options.interactive and options.debug:
331 parser.error("-i/--interactive and -d/--debug are incompatible")
331 parser.error("-i/--interactive and -d/--debug are incompatible")
332 if options.debug:
332 if options.debug:
333 if options.timeout != defaults['timeout']:
333 if options.timeout != defaults['timeout']:
334 sys.stderr.write(
334 sys.stderr.write(
335 'warning: --timeout option ignored with --debug\n')
335 'warning: --timeout option ignored with --debug\n')
336 if options.slowtimeout != defaults['slowtimeout']:
336 if options.slowtimeout != defaults['slowtimeout']:
337 sys.stderr.write(
337 sys.stderr.write(
338 'warning: --slowtimeout option ignored with --debug\n')
338 'warning: --slowtimeout option ignored with --debug\n')
339 options.timeout = 0
339 options.timeout = 0
340 options.slowtimeout = 0
340 options.slowtimeout = 0
341 if options.py3k_warnings:
341 if options.py3k_warnings:
342 if PYTHON3:
342 if PYTHON3:
343 parser.error(
343 parser.error(
344 '--py3k-warnings can only be used on Python 2.6 and 2.7')
344 '--py3k-warnings can only be used on Python 2.6 and 2.7')
345 if options.blacklist:
345 if options.blacklist:
346 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
346 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
347 if options.whitelist:
347 if options.whitelist:
348 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
348 options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
349 else:
349 else:
350 options.whitelisted = {}
350 options.whitelisted = {}
351
351
352 if options.showchannels:
352 if options.showchannels:
353 options.nodiff = True
353 options.nodiff = True
354
354
355 return (options, args)
355 return (options, args)
356
356
357 def rename(src, dst):
357 def rename(src, dst):
358 """Like os.rename(), trade atomicity and opened files friendliness
358 """Like os.rename(), trade atomicity and opened files friendliness
359 for existing destination support.
359 for existing destination support.
360 """
360 """
361 shutil.copy(src, dst)
361 shutil.copy(src, dst)
362 os.remove(src)
362 os.remove(src)
363
363
364 _unified_diff = difflib.unified_diff
364 _unified_diff = difflib.unified_diff
365 if PYTHON3:
365 if PYTHON3:
366 import functools
366 import functools
367 _unified_diff = functools.partial(difflib.diff_bytes, difflib.unified_diff)
367 _unified_diff = functools.partial(difflib.diff_bytes, difflib.unified_diff)
368
368
369 def getdiff(expected, output, ref, err):
369 def getdiff(expected, output, ref, err):
370 servefail = False
370 servefail = False
371 lines = []
371 lines = []
372 for line in _unified_diff(expected, output, ref, err):
372 for line in _unified_diff(expected, output, ref, err):
373 if line.startswith(b'+++') or line.startswith(b'---'):
373 if line.startswith(b'+++') or line.startswith(b'---'):
374 line = line.replace(b'\\', b'/')
374 line = line.replace(b'\\', b'/')
375 if line.endswith(b' \n'):
375 if line.endswith(b' \n'):
376 line = line[:-2] + b'\n'
376 line = line[:-2] + b'\n'
377 lines.append(line)
377 lines.append(line)
378 if not servefail and line.startswith(
378 if not servefail and line.startswith(
379 b'+ abort: child process failed to start'):
379 b'+ abort: child process failed to start'):
380 servefail = True
380 servefail = True
381
381
382 return servefail, lines
382 return servefail, lines
383
383
384 verbose = False
384 verbose = False
385 def vlog(*msg):
385 def vlog(*msg):
386 """Log only when in verbose mode."""
386 """Log only when in verbose mode."""
387 if verbose is False:
387 if verbose is False:
388 return
388 return
389
389
390 return log(*msg)
390 return log(*msg)
391
391
392 # Bytes that break XML even in a CDATA block: control characters 0-31
392 # Bytes that break XML even in a CDATA block: control characters 0-31
393 # sans \t, \n and \r
393 # sans \t, \n and \r
394 CDATA_EVIL = re.compile(br"[\000-\010\013\014\016-\037]")
394 CDATA_EVIL = re.compile(br"[\000-\010\013\014\016-\037]")
395
395
396 def cdatasafe(data):
396 def cdatasafe(data):
397 """Make a string safe to include in a CDATA block.
397 """Make a string safe to include in a CDATA block.
398
398
399 Certain control characters are illegal in a CDATA block, and
399 Certain control characters are illegal in a CDATA block, and
400 there's no way to include a ]]> in a CDATA either. This function
400 there's no way to include a ]]> in a CDATA either. This function
401 replaces illegal bytes with ? and adds a space between the ]] so
401 replaces illegal bytes with ? and adds a space between the ]] so
402 that it won't break the CDATA block.
402 that it won't break the CDATA block.
403 """
403 """
404 return CDATA_EVIL.sub(b'?', data).replace(b']]>', b'] ]>')
404 return CDATA_EVIL.sub(b'?', data).replace(b']]>', b'] ]>')
405
405
406 def log(*msg):
406 def log(*msg):
407 """Log something to stdout.
407 """Log something to stdout.
408
408
409 Arguments are strings to print.
409 Arguments are strings to print.
410 """
410 """
411 with iolock:
411 with iolock:
412 if verbose:
412 if verbose:
413 print(verbose, end=' ')
413 print(verbose, end=' ')
414 for m in msg:
414 for m in msg:
415 print(m, end=' ')
415 print(m, end=' ')
416 print()
416 print()
417 sys.stdout.flush()
417 sys.stdout.flush()
418
418
419 def terminate(proc):
419 def terminate(proc):
420 """Terminate subprocess (with fallback for Python versions < 2.6)"""
420 """Terminate subprocess (with fallback for Python versions < 2.6)"""
421 vlog('# Terminating process %d' % proc.pid)
421 vlog('# Terminating process %d' % proc.pid)
422 try:
422 try:
423 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
423 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
424 except OSError:
424 except OSError:
425 pass
425 pass
426
426
427 def killdaemons(pidfile):
427 def killdaemons(pidfile):
428 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
428 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
429 logfn=vlog)
429 logfn=vlog)
430
430
431 class Test(unittest.TestCase):
431 class Test(unittest.TestCase):
432 """Encapsulates a single, runnable test.
432 """Encapsulates a single, runnable test.
433
433
434 While this class conforms to the unittest.TestCase API, it differs in that
434 While this class conforms to the unittest.TestCase API, it differs in that
435 instances need to be instantiated manually. (Typically, unittest.TestCase
435 instances need to be instantiated manually. (Typically, unittest.TestCase
436 classes are instantiated automatically by scanning modules.)
436 classes are instantiated automatically by scanning modules.)
437 """
437 """
438
438
439 # Status code reserved for skipped tests (used by hghave).
439 # Status code reserved for skipped tests (used by hghave).
440 SKIPPED_STATUS = 80
440 SKIPPED_STATUS = 80
441
441
442 def __init__(self, path, tmpdir, keeptmpdir=False,
442 def __init__(self, path, tmpdir, keeptmpdir=False,
443 debug=False,
443 debug=False,
444 timeout=defaults['timeout'],
444 timeout=defaults['timeout'],
445 startport=defaults['port'], extraconfigopts=None,
445 startport=defaults['port'], extraconfigopts=None,
446 py3kwarnings=False, shell=None,
446 py3kwarnings=False, shell=None,
447 slowtimeout=defaults['slowtimeout']):
447 slowtimeout=defaults['slowtimeout']):
448 """Create a test from parameters.
448 """Create a test from parameters.
449
449
450 path is the full path to the file defining the test.
450 path is the full path to the file defining the test.
451
451
452 tmpdir is the main temporary directory to use for this test.
452 tmpdir is the main temporary directory to use for this test.
453
453
454 keeptmpdir determines whether to keep the test's temporary directory
454 keeptmpdir determines whether to keep the test's temporary directory
455 after execution. It defaults to removal (False).
455 after execution. It defaults to removal (False).
456
456
457 debug mode will make the test execute verbosely, with unfiltered
457 debug mode will make the test execute verbosely, with unfiltered
458 output.
458 output.
459
459
460 timeout controls the maximum run time of the test. It is ignored when
460 timeout controls the maximum run time of the test. It is ignored when
461 debug is True. See slowtimeout for tests with #require slow.
461 debug is True. See slowtimeout for tests with #require slow.
462
462
463 slowtimeout overrides timeout if the test has #require slow.
463 slowtimeout overrides timeout if the test has #require slow.
464
464
465 startport controls the starting port number to use for this test. Each
465 startport controls the starting port number to use for this test. Each
466 test will reserve 3 port numbers for execution. It is the caller's
466 test will reserve 3 port numbers for execution. It is the caller's
467 responsibility to allocate a non-overlapping port range to Test
467 responsibility to allocate a non-overlapping port range to Test
468 instances.
468 instances.
469
469
470 extraconfigopts is an iterable of extra hgrc config options. Values
470 extraconfigopts is an iterable of extra hgrc config options. Values
471 must have the form "key=value" (something understood by hgrc). Values
471 must have the form "key=value" (something understood by hgrc). Values
472 of the form "foo.key=value" will result in "[foo] key=value".
472 of the form "foo.key=value" will result in "[foo] key=value".
473
473
474 py3kwarnings enables Py3k warnings.
474 py3kwarnings enables Py3k warnings.
475
475
476 shell is the shell to execute tests in.
476 shell is the shell to execute tests in.
477 """
477 """
478 self.path = path
478 self.path = path
479 self.bname = os.path.basename(path)
479 self.bname = os.path.basename(path)
480 self.name = _strpath(self.bname)
480 self.name = _strpath(self.bname)
481 self._testdir = os.path.dirname(path)
481 self._testdir = os.path.dirname(path)
482 self.errpath = os.path.join(self._testdir, b'%s.err' % self.bname)
482 self.errpath = os.path.join(self._testdir, b'%s.err' % self.bname)
483
483
484 self._threadtmp = tmpdir
484 self._threadtmp = tmpdir
485 self._keeptmpdir = keeptmpdir
485 self._keeptmpdir = keeptmpdir
486 self._debug = debug
486 self._debug = debug
487 self._timeout = timeout
487 self._timeout = timeout
488 self._slowtimeout = slowtimeout
488 self._slowtimeout = slowtimeout
489 self._startport = startport
489 self._startport = startport
490 self._extraconfigopts = extraconfigopts or []
490 self._extraconfigopts = extraconfigopts or []
491 self._py3kwarnings = py3kwarnings
491 self._py3kwarnings = py3kwarnings
492 self._shell = _bytespath(shell)
492 self._shell = _bytespath(shell)
493
493
494 self._aborted = False
494 self._aborted = False
495 self._daemonpids = []
495 self._daemonpids = []
496 self._finished = None
496 self._finished = None
497 self._ret = None
497 self._ret = None
498 self._out = None
498 self._out = None
499 self._skipped = None
499 self._skipped = None
500 self._testtmp = None
500 self._testtmp = None
501
501
502 # If we're not in --debug mode and reference output file exists,
502 # If we're not in --debug mode and reference output file exists,
503 # check test output against it.
503 # check test output against it.
504 if debug:
504 if debug:
505 self._refout = None # to match "out is None"
505 self._refout = None # to match "out is None"
506 elif os.path.exists(self.refpath):
506 elif os.path.exists(self.refpath):
507 f = open(self.refpath, 'rb')
507 f = open(self.refpath, 'rb')
508 self._refout = f.read().splitlines(True)
508 self._refout = f.read().splitlines(True)
509 f.close()
509 f.close()
510 else:
510 else:
511 self._refout = []
511 self._refout = []
512
512
513 # needed to get base class __repr__ running
513 # needed to get base class __repr__ running
514 @property
514 @property
515 def _testMethodName(self):
515 def _testMethodName(self):
516 return self.name
516 return self.name
517
517
518 def __str__(self):
518 def __str__(self):
519 return self.name
519 return self.name
520
520
521 def shortDescription(self):
521 def shortDescription(self):
522 return self.name
522 return self.name
523
523
524 def setUp(self):
524 def setUp(self):
525 """Tasks to perform before run()."""
525 """Tasks to perform before run()."""
526 self._finished = False
526 self._finished = False
527 self._ret = None
527 self._ret = None
528 self._out = None
528 self._out = None
529 self._skipped = None
529 self._skipped = None
530
530
531 try:
531 try:
532 os.mkdir(self._threadtmp)
532 os.mkdir(self._threadtmp)
533 except OSError as e:
533 except OSError as e:
534 if e.errno != errno.EEXIST:
534 if e.errno != errno.EEXIST:
535 raise
535 raise
536
536
537 self._testtmp = os.path.join(self._threadtmp,
537 self._testtmp = os.path.join(self._threadtmp,
538 os.path.basename(self.path))
538 os.path.basename(self.path))
539 os.mkdir(self._testtmp)
539 os.mkdir(self._testtmp)
540
540
541 # Remove any previous output files.
541 # Remove any previous output files.
542 if os.path.exists(self.errpath):
542 if os.path.exists(self.errpath):
543 try:
543 try:
544 os.remove(self.errpath)
544 os.remove(self.errpath)
545 except OSError as e:
545 except OSError as e:
546 # We might have raced another test to clean up a .err
546 # We might have raced another test to clean up a .err
547 # file, so ignore ENOENT when removing a previous .err
547 # file, so ignore ENOENT when removing a previous .err
548 # file.
548 # file.
549 if e.errno != errno.ENOENT:
549 if e.errno != errno.ENOENT:
550 raise
550 raise
551
551
552 def run(self, result):
552 def run(self, result):
553 """Run this test and report results against a TestResult instance."""
553 """Run this test and report results against a TestResult instance."""
554 # This function is extremely similar to unittest.TestCase.run(). Once
554 # This function is extremely similar to unittest.TestCase.run(). Once
555 # we require Python 2.7 (or at least its version of unittest), this
555 # we require Python 2.7 (or at least its version of unittest), this
556 # function can largely go away.
556 # function can largely go away.
557 self._result = result
557 self._result = result
558 result.startTest(self)
558 result.startTest(self)
559 try:
559 try:
560 try:
560 try:
561 self.setUp()
561 self.setUp()
562 except (KeyboardInterrupt, SystemExit):
562 except (KeyboardInterrupt, SystemExit):
563 self._aborted = True
563 self._aborted = True
564 raise
564 raise
565 except Exception:
565 except Exception:
566 result.addError(self, sys.exc_info())
566 result.addError(self, sys.exc_info())
567 return
567 return
568
568
569 success = False
569 success = False
570 try:
570 try:
571 self.runTest()
571 self.runTest()
572 except KeyboardInterrupt:
572 except KeyboardInterrupt:
573 self._aborted = True
573 self._aborted = True
574 raise
574 raise
575 except SkipTest as e:
575 except SkipTest as e:
576 result.addSkip(self, str(e))
576 result.addSkip(self, str(e))
577 # The base class will have already counted this as a
577 # The base class will have already counted this as a
578 # test we "ran", but we want to exclude skipped tests
578 # test we "ran", but we want to exclude skipped tests
579 # from those we count towards those run.
579 # from those we count towards those run.
580 result.testsRun -= 1
580 result.testsRun -= 1
581 except IgnoreTest as e:
581 except IgnoreTest as e:
582 result.addIgnore(self, str(e))
582 result.addIgnore(self, str(e))
583 # As with skips, ignores also should be excluded from
583 # As with skips, ignores also should be excluded from
584 # the number of tests executed.
584 # the number of tests executed.
585 result.testsRun -= 1
585 result.testsRun -= 1
586 except WarnTest as e:
586 except WarnTest as e:
587 result.addWarn(self, str(e))
587 result.addWarn(self, str(e))
588 except ReportedTest as e:
588 except ReportedTest as e:
589 pass
589 pass
590 except self.failureException as e:
590 except self.failureException as e:
591 # This differs from unittest in that we don't capture
591 # This differs from unittest in that we don't capture
592 # the stack trace. This is for historical reasons and
592 # the stack trace. This is for historical reasons and
593 # this decision could be revisited in the future,
593 # this decision could be revisited in the future,
594 # especially for PythonTest instances.
594 # especially for PythonTest instances.
595 if result.addFailure(self, str(e)):
595 if result.addFailure(self, str(e)):
596 success = True
596 success = True
597 except Exception:
597 except Exception:
598 result.addError(self, sys.exc_info())
598 result.addError(self, sys.exc_info())
599 else:
599 else:
600 success = True
600 success = True
601
601
602 try:
602 try:
603 self.tearDown()
603 self.tearDown()
604 except (KeyboardInterrupt, SystemExit):
604 except (KeyboardInterrupt, SystemExit):
605 self._aborted = True
605 self._aborted = True
606 raise
606 raise
607 except Exception:
607 except Exception:
608 result.addError(self, sys.exc_info())
608 result.addError(self, sys.exc_info())
609 success = False
609 success = False
610
610
611 if success:
611 if success:
612 result.addSuccess(self)
612 result.addSuccess(self)
613 finally:
613 finally:
614 result.stopTest(self, interrupted=self._aborted)
614 result.stopTest(self, interrupted=self._aborted)
615
615
616 def runTest(self):
616 def runTest(self):
617 """Run this test instance.
617 """Run this test instance.
618
618
619 This will return a tuple describing the result of the test.
619 This will return a tuple describing the result of the test.
620 """
620 """
621 env = self._getenv()
621 env = self._getenv()
622 self._daemonpids.append(env['DAEMON_PIDS'])
622 self._daemonpids.append(env['DAEMON_PIDS'])
623 self._createhgrc(env['HGRCPATH'])
623 self._createhgrc(env['HGRCPATH'])
624
624
625 vlog('# Test', self.name)
625 vlog('# Test', self.name)
626
626
627 ret, out = self._run(env)
627 ret, out = self._run(env)
628 self._finished = True
628 self._finished = True
629 self._ret = ret
629 self._ret = ret
630 self._out = out
630 self._out = out
631
631
632 def describe(ret):
632 def describe(ret):
633 if ret < 0:
633 if ret < 0:
634 return 'killed by signal: %d' % -ret
634 return 'killed by signal: %d' % -ret
635 return 'returned error code %d' % ret
635 return 'returned error code %d' % ret
636
636
637 self._skipped = False
637 self._skipped = False
638
638
639 if ret == self.SKIPPED_STATUS:
639 if ret == self.SKIPPED_STATUS:
640 if out is None: # Debug mode, nothing to parse.
640 if out is None: # Debug mode, nothing to parse.
641 missing = ['unknown']
641 missing = ['unknown']
642 failed = None
642 failed = None
643 else:
643 else:
644 missing, failed = TTest.parsehghaveoutput(out)
644 missing, failed = TTest.parsehghaveoutput(out)
645
645
646 if not missing:
646 if not missing:
647 missing = ['skipped']
647 missing = ['skipped']
648
648
649 if failed:
649 if failed:
650 self.fail('hg have failed checking for %s' % failed[-1])
650 self.fail('hg have failed checking for %s' % failed[-1])
651 else:
651 else:
652 self._skipped = True
652 self._skipped = True
653 raise SkipTest(missing[-1])
653 raise SkipTest(missing[-1])
654 elif ret == 'timeout':
654 elif ret == 'timeout':
655 self.fail('timed out')
655 self.fail('timed out')
656 elif ret is False:
656 elif ret is False:
657 raise WarnTest('no result code from test')
657 raise WarnTest('no result code from test')
658 elif out != self._refout:
658 elif out != self._refout:
659 # Diff generation may rely on written .err file.
659 # Diff generation may rely on written .err file.
660 if (ret != 0 or out != self._refout) and not self._skipped \
660 if (ret != 0 or out != self._refout) and not self._skipped \
661 and not self._debug:
661 and not self._debug:
662 f = open(self.errpath, 'wb')
662 f = open(self.errpath, 'wb')
663 for line in out:
663 for line in out:
664 f.write(line)
664 f.write(line)
665 f.close()
665 f.close()
666
666
667 # The result object handles diff calculation for us.
667 # The result object handles diff calculation for us.
668 if self._result.addOutputMismatch(self, ret, out, self._refout):
668 if self._result.addOutputMismatch(self, ret, out, self._refout):
669 # change was accepted, skip failing
669 # change was accepted, skip failing
670 return
670 return
671
671
672 if ret:
672 if ret:
673 msg = 'output changed and ' + describe(ret)
673 msg = 'output changed and ' + describe(ret)
674 else:
674 else:
675 msg = 'output changed'
675 msg = 'output changed'
676
676
677 self.fail(msg)
677 self.fail(msg)
678 elif ret:
678 elif ret:
679 self.fail(describe(ret))
679 self.fail(describe(ret))
680
680
681 def tearDown(self):
681 def tearDown(self):
682 """Tasks to perform after run()."""
682 """Tasks to perform after run()."""
683 for entry in self._daemonpids:
683 for entry in self._daemonpids:
684 killdaemons(entry)
684 killdaemons(entry)
685 self._daemonpids = []
685 self._daemonpids = []
686
686
687 if self._keeptmpdir:
687 if self._keeptmpdir:
688 log('\nKeeping testtmp dir: %s\nKeeping threadtmp dir: %s' %
688 log('\nKeeping testtmp dir: %s\nKeeping threadtmp dir: %s' %
689 (self._testtmp, self._threadtmp))
689 (self._testtmp, self._threadtmp))
690 else:
690 else:
691 shutil.rmtree(self._testtmp, True)
691 shutil.rmtree(self._testtmp, True)
692 shutil.rmtree(self._threadtmp, True)
692 shutil.rmtree(self._threadtmp, True)
693
693
694 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
694 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
695 and not self._debug and self._out:
695 and not self._debug and self._out:
696 f = open(self.errpath, 'wb')
696 f = open(self.errpath, 'wb')
697 for line in self._out:
697 for line in self._out:
698 f.write(line)
698 f.write(line)
699 f.close()
699 f.close()
700
700
701 vlog("# Ret was:", self._ret, '(%s)' % self.name)
701 vlog("# Ret was:", self._ret, '(%s)' % self.name)
702
702
703 def _run(self, env):
703 def _run(self, env):
704 # This should be implemented in child classes to run tests.
704 # This should be implemented in child classes to run tests.
705 raise SkipTest('unknown test type')
705 raise SkipTest('unknown test type')
706
706
707 def abort(self):
707 def abort(self):
708 """Terminate execution of this test."""
708 """Terminate execution of this test."""
709 self._aborted = True
709 self._aborted = True
710
710
711 def _getreplacements(self):
711 def _getreplacements(self):
712 """Obtain a mapping of text replacements to apply to test output.
712 """Obtain a mapping of text replacements to apply to test output.
713
713
714 Test output needs to be normalized so it can be compared to expected
714 Test output needs to be normalized so it can be compared to expected
715 output. This function defines how some of that normalization will
715 output. This function defines how some of that normalization will
716 occur.
716 occur.
717 """
717 """
718 r = [
718 r = [
719 (br':%d\b' % self._startport, b':$HGPORT'),
719 (br':%d\b' % self._startport, b':$HGPORT'),
720 (br':%d\b' % (self._startport + 1), b':$HGPORT1'),
720 (br':%d\b' % (self._startport + 1), b':$HGPORT1'),
721 (br':%d\b' % (self._startport + 2), b':$HGPORT2'),
721 (br':%d\b' % (self._startport + 2), b':$HGPORT2'),
722 (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
722 (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
723 br'\1 (glob)'),
723 br'\1 (glob)'),
724 ]
724 ]
725
725
726 if os.name == 'nt':
726 if os.name == 'nt':
727 r.append(
727 r.append(
728 (b''.join(c.isalpha() and b'[%s%s]' % (c.lower(), c.upper()) or
728 (b''.join(c.isalpha() and b'[%s%s]' % (c.lower(), c.upper()) or
729 c in b'/\\' and br'[/\\]' or c.isdigit() and c or b'\\' + c
729 c in b'/\\' and br'[/\\]' or c.isdigit() and c or b'\\' + c
730 for c in self._testtmp), b'$TESTTMP'))
730 for c in self._testtmp), b'$TESTTMP'))
731 else:
731 else:
732 r.append((re.escape(self._testtmp), b'$TESTTMP'))
732 r.append((re.escape(self._testtmp), b'$TESTTMP'))
733
733
734 return r
734 return r
735
735
736 def _getenv(self):
736 def _getenv(self):
737 """Obtain environment variables to use during test execution."""
737 """Obtain environment variables to use during test execution."""
738 env = os.environ.copy()
738 env = os.environ.copy()
739 env['TESTTMP'] = self._testtmp
739 env['TESTTMP'] = self._testtmp
740 env['HOME'] = self._testtmp
740 env['HOME'] = self._testtmp
741 env["HGPORT"] = str(self._startport)
741 env["HGPORT"] = str(self._startport)
742 env["HGPORT1"] = str(self._startport + 1)
742 env["HGPORT1"] = str(self._startport + 1)
743 env["HGPORT2"] = str(self._startport + 2)
743 env["HGPORT2"] = str(self._startport + 2)
744 env["HGRCPATH"] = os.path.join(self._threadtmp, b'.hgrc')
744 env["HGRCPATH"] = os.path.join(self._threadtmp, b'.hgrc')
745 env["DAEMON_PIDS"] = os.path.join(self._threadtmp, b'daemon.pids')
745 env["DAEMON_PIDS"] = os.path.join(self._threadtmp, b'daemon.pids')
746 env["HGEDITOR"] = ('"' + sys.executable + '"'
746 env["HGEDITOR"] = ('"' + sys.executable + '"'
747 + ' -c "import sys; sys.exit(0)"')
747 + ' -c "import sys; sys.exit(0)"')
748 env["HGMERGE"] = "internal:merge"
748 env["HGMERGE"] = "internal:merge"
749 env["HGUSER"] = "test"
749 env["HGUSER"] = "test"
750 env["HGENCODING"] = "ascii"
750 env["HGENCODING"] = "ascii"
751 env["HGENCODINGMODE"] = "strict"
751 env["HGENCODINGMODE"] = "strict"
752
752
753 # Reset some environment variables to well-known values so that
753 # Reset some environment variables to well-known values so that
754 # the tests produce repeatable output.
754 # the tests produce repeatable output.
755 env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
755 env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
756 env['TZ'] = 'GMT'
756 env['TZ'] = 'GMT'
757 env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
757 env["EMAIL"] = "Foo Bar <foo.bar@example.com>"
758 env['COLUMNS'] = '80'
758 env['COLUMNS'] = '80'
759 env['TERM'] = 'xterm'
759 env['TERM'] = 'xterm'
760
760
761 for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
761 for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
762 'NO_PROXY').split():
762 'NO_PROXY').split():
763 if k in env:
763 if k in env:
764 del env[k]
764 del env[k]
765
765
766 # unset env related to hooks
766 # unset env related to hooks
767 for k in env.keys():
767 for k in env.keys():
768 if k.startswith('HG_'):
768 if k.startswith('HG_'):
769 del env[k]
769 del env[k]
770
770
771 return env
771 return env
772
772
773 def _createhgrc(self, path):
773 def _createhgrc(self, path):
774 """Create an hgrc file for this test."""
774 """Create an hgrc file for this test."""
775 hgrc = open(path, 'wb')
775 hgrc = open(path, 'wb')
776 hgrc.write(b'[ui]\n')
776 hgrc.write(b'[ui]\n')
777 hgrc.write(b'slash = True\n')
777 hgrc.write(b'slash = True\n')
778 hgrc.write(b'interactive = False\n')
778 hgrc.write(b'interactive = False\n')
779 hgrc.write(b'mergemarkers = detailed\n')
779 hgrc.write(b'mergemarkers = detailed\n')
780 hgrc.write(b'promptecho = True\n')
780 hgrc.write(b'promptecho = True\n')
781 hgrc.write(b'[defaults]\n')
781 hgrc.write(b'[defaults]\n')
782 hgrc.write(b'backout = -d "0 0"\n')
782 hgrc.write(b'backout = -d "0 0"\n')
783 hgrc.write(b'commit = -d "0 0"\n')
783 hgrc.write(b'commit = -d "0 0"\n')
784 hgrc.write(b'shelve = --date "0 0"\n')
784 hgrc.write(b'shelve = --date "0 0"\n')
785 hgrc.write(b'tag = -d "0 0"\n')
785 hgrc.write(b'tag = -d "0 0"\n')
786 hgrc.write(b'[devel]\n')
786 hgrc.write(b'[devel]\n')
787 hgrc.write(b'all-warnings = true\n')
787 hgrc.write(b'all-warnings = true\n')
788 hgrc.write(b'[largefiles]\n')
788 hgrc.write(b'[largefiles]\n')
789 hgrc.write(b'usercache = %s\n' %
789 hgrc.write(b'usercache = %s\n' %
790 (os.path.join(self._testtmp, b'.cache/largefiles')))
790 (os.path.join(self._testtmp, b'.cache/largefiles')))
791
791
792 for opt in self._extraconfigopts:
792 for opt in self._extraconfigopts:
793 section, key = opt.split('.', 1)
793 section, key = opt.split('.', 1)
794 assert '=' in key, ('extra config opt %s must '
794 assert '=' in key, ('extra config opt %s must '
795 'have an = for assignment' % opt)
795 'have an = for assignment' % opt)
796 hgrc.write(b'[%s]\n%s\n' % (section, key))
796 hgrc.write(b'[%s]\n%s\n' % (section, key))
797 hgrc.close()
797 hgrc.close()
798
798
799 def fail(self, msg):
799 def fail(self, msg):
800 # unittest differentiates between errored and failed.
800 # unittest differentiates between errored and failed.
801 # Failed is denoted by AssertionError (by default at least).
801 # Failed is denoted by AssertionError (by default at least).
802 raise AssertionError(msg)
802 raise AssertionError(msg)
803
803
804 def _runcommand(self, cmd, env, normalizenewlines=False):
804 def _runcommand(self, cmd, env, normalizenewlines=False):
805 """Run command in a sub-process, capturing the output (stdout and
805 """Run command in a sub-process, capturing the output (stdout and
806 stderr).
806 stderr).
807
807
808 Return a tuple (exitcode, output). output is None in debug mode.
808 Return a tuple (exitcode, output). output is None in debug mode.
809 """
809 """
810 if self._debug:
810 if self._debug:
811 proc = subprocess.Popen(cmd, shell=True, cwd=self._testtmp,
811 proc = subprocess.Popen(cmd, shell=True, cwd=self._testtmp,
812 env=env)
812 env=env)
813 ret = proc.wait()
813 ret = proc.wait()
814 return (ret, None)
814 return (ret, None)
815
815
816 proc = Popen4(cmd, self._testtmp, self._timeout, env)
816 proc = Popen4(cmd, self._testtmp, self._timeout, env)
817 def cleanup():
817 def cleanup():
818 terminate(proc)
818 terminate(proc)
819 ret = proc.wait()
819 ret = proc.wait()
820 if ret == 0:
820 if ret == 0:
821 ret = signal.SIGTERM << 8
821 ret = signal.SIGTERM << 8
822 killdaemons(env['DAEMON_PIDS'])
822 killdaemons(env['DAEMON_PIDS'])
823 return ret
823 return ret
824
824
825 output = ''
825 output = ''
826 proc.tochild.close()
826 proc.tochild.close()
827
827
828 try:
828 try:
829 output = proc.fromchild.read()
829 output = proc.fromchild.read()
830 except KeyboardInterrupt:
830 except KeyboardInterrupt:
831 vlog('# Handling keyboard interrupt')
831 vlog('# Handling keyboard interrupt')
832 cleanup()
832 cleanup()
833 raise
833 raise
834
834
835 ret = proc.wait()
835 ret = proc.wait()
836 if wifexited(ret):
836 if wifexited(ret):
837 ret = os.WEXITSTATUS(ret)
837 ret = os.WEXITSTATUS(ret)
838
838
839 if proc.timeout:
839 if proc.timeout:
840 ret = 'timeout'
840 ret = 'timeout'
841
841
842 if ret:
842 if ret:
843 killdaemons(env['DAEMON_PIDS'])
843 killdaemons(env['DAEMON_PIDS'])
844
844
845 for s, r in self._getreplacements():
845 for s, r in self._getreplacements():
846 output = re.sub(s, r, output)
846 output = re.sub(s, r, output)
847
847
848 if normalizenewlines:
848 if normalizenewlines:
849 output = output.replace('\r\n', '\n')
849 output = output.replace('\r\n', '\n')
850
850
851 return ret, output.splitlines(True)
851 return ret, output.splitlines(True)
852
852
853 class PythonTest(Test):
853 class PythonTest(Test):
854 """A Python-based test."""
854 """A Python-based test."""
855
855
856 @property
856 @property
857 def refpath(self):
857 def refpath(self):
858 return os.path.join(self._testdir, b'%s.out' % self.bname)
858 return os.path.join(self._testdir, b'%s.out' % self.bname)
859
859
860 def _run(self, env):
860 def _run(self, env):
861 py3kswitch = self._py3kwarnings and b' -3' or b''
861 py3kswitch = self._py3kwarnings and b' -3' or b''
862 cmd = b'%s%s "%s"' % (PYTHON, py3kswitch, self.path)
862 cmd = b'%s%s "%s"' % (PYTHON, py3kswitch, self.path)
863 vlog("# Running", cmd)
863 vlog("# Running", cmd)
864 normalizenewlines = os.name == 'nt'
864 normalizenewlines = os.name == 'nt'
865 result = self._runcommand(cmd, env,
865 result = self._runcommand(cmd, env,
866 normalizenewlines=normalizenewlines)
866 normalizenewlines=normalizenewlines)
867 if self._aborted:
867 if self._aborted:
868 raise KeyboardInterrupt()
868 raise KeyboardInterrupt()
869
869
870 return result
870 return result
871
871
872 # This script may want to drop globs from lines matching these patterns on
872 # This script may want to drop globs from lines matching these patterns on
873 # Windows, but check-code.py wants a glob on these lines unconditionally. Don't
873 # Windows, but check-code.py wants a glob on these lines unconditionally. Don't
874 # warn if that is the case for anything matching these lines.
874 # warn if that is the case for anything matching these lines.
875 checkcodeglobpats = [
875 checkcodeglobpats = [
876 re.compile(br'^pushing to \$TESTTMP/.*[^)]$'),
876 re.compile(br'^pushing to \$TESTTMP/.*[^)]$'),
877 re.compile(br'^moving \S+/.*[^)]$'),
877 re.compile(br'^moving \S+/.*[^)]$'),
878 re.compile(br'^pulling from \$TESTTMP/.*[^)]$')
878 re.compile(br'^pulling from \$TESTTMP/.*[^)]$')
879 ]
879 ]
880
880
881 bchr = chr
881 bchr = chr
882 if PYTHON3:
882 if PYTHON3:
883 bchr = lambda x: bytes([x])
883 bchr = lambda x: bytes([x])
884
884
885 class TTest(Test):
885 class TTest(Test):
886 """A "t test" is a test backed by a .t file."""
886 """A "t test" is a test backed by a .t file."""
887
887
888 SKIPPED_PREFIX = 'skipped: '
888 SKIPPED_PREFIX = 'skipped: '
889 FAILED_PREFIX = 'hghave check failed: '
889 FAILED_PREFIX = 'hghave check failed: '
890 NEEDESCAPE = re.compile(br'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
890 NEEDESCAPE = re.compile(br'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
891
891
892 ESCAPESUB = re.compile(br'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
892 ESCAPESUB = re.compile(br'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
893 ESCAPEMAP = dict((bchr(i), br'\x%02x' % i) for i in range(256))
893 ESCAPEMAP = dict((bchr(i), br'\x%02x' % i) for i in range(256))
894 ESCAPEMAP.update({b'\\': b'\\\\', b'\r': br'\r'})
894 ESCAPEMAP.update({b'\\': b'\\\\', b'\r': br'\r'})
895
895
896 @property
896 @property
897 def refpath(self):
897 def refpath(self):
898 return os.path.join(self._testdir, self.bname)
898 return os.path.join(self._testdir, self.bname)
899
899
900 def _run(self, env):
900 def _run(self, env):
901 f = open(self.path, 'rb')
901 f = open(self.path, 'rb')
902 lines = f.readlines()
902 lines = f.readlines()
903 f.close()
903 f.close()
904
904
905 salt, script, after, expected = self._parsetest(lines)
905 salt, script, after, expected = self._parsetest(lines)
906
906
907 # Write out the generated script.
907 # Write out the generated script.
908 fname = b'%s.sh' % self._testtmp
908 fname = b'%s.sh' % self._testtmp
909 f = open(fname, 'wb')
909 f = open(fname, 'wb')
910 for l in script:
910 for l in script:
911 f.write(l)
911 f.write(l)
912 f.close()
912 f.close()
913
913
914 cmd = b'%s "%s"' % (self._shell, fname)
914 cmd = b'%s "%s"' % (self._shell, fname)
915 vlog("# Running", cmd)
915 vlog("# Running", cmd)
916
916
917 exitcode, output = self._runcommand(cmd, env)
917 exitcode, output = self._runcommand(cmd, env)
918
918
919 if self._aborted:
919 if self._aborted:
920 raise KeyboardInterrupt()
920 raise KeyboardInterrupt()
921
921
922 # Do not merge output if skipped. Return hghave message instead.
922 # Do not merge output if skipped. Return hghave message instead.
923 # Similarly, with --debug, output is None.
923 # Similarly, with --debug, output is None.
924 if exitcode == self.SKIPPED_STATUS or output is None:
924 if exitcode == self.SKIPPED_STATUS or output is None:
925 return exitcode, output
925 return exitcode, output
926
926
927 return self._processoutput(exitcode, output, salt, after, expected)
927 return self._processoutput(exitcode, output, salt, after, expected)
928
928
929 def _hghave(self, reqs):
929 def _hghave(self, reqs):
930 # TODO do something smarter when all other uses of hghave are gone.
930 # TODO do something smarter when all other uses of hghave are gone.
931 runtestdir = os.path.abspath(os.path.dirname(_bytespath(__file__)))
931 runtestdir = os.path.abspath(os.path.dirname(_bytespath(__file__)))
932 tdir = runtestdir.replace(b'\\', b'/')
932 tdir = runtestdir.replace(b'\\', b'/')
933 proc = Popen4(b'%s -c "%s/hghave %s"' %
933 proc = Popen4(b'%s -c "%s/hghave %s"' %
934 (self._shell, tdir, b' '.join(reqs)),
934 (self._shell, tdir, b' '.join(reqs)),
935 self._testtmp, 0, self._getenv())
935 self._testtmp, 0, self._getenv())
936 stdout, stderr = proc.communicate()
936 stdout, stderr = proc.communicate()
937 ret = proc.wait()
937 ret = proc.wait()
938 if wifexited(ret):
938 if wifexited(ret):
939 ret = os.WEXITSTATUS(ret)
939 ret = os.WEXITSTATUS(ret)
940 if ret == 2:
940 if ret == 2:
941 print(stdout)
941 print(stdout)
942 sys.exit(1)
942 sys.exit(1)
943
943
944 if ret != 0:
944 if ret != 0:
945 return False, stdout
945 return False, stdout
946
946
947 if 'slow' in reqs:
947 if 'slow' in reqs:
948 self._timeout = self._slowtimeout
948 self._timeout = self._slowtimeout
949 return True, None
949 return True, None
950
950
951 def _parsetest(self, lines):
951 def _parsetest(self, lines):
952 # We generate a shell script which outputs unique markers to line
952 # We generate a shell script which outputs unique markers to line
953 # up script results with our source. These markers include input
953 # up script results with our source. These markers include input
954 # line number and the last return code.
954 # line number and the last return code.
955 salt = b"SALT%d" % time.time()
955 salt = b"SALT%d" % time.time()
956 def addsalt(line, inpython):
956 def addsalt(line, inpython):
957 if inpython:
957 if inpython:
958 script.append(b'%s %d 0\n' % (salt, line))
958 script.append(b'%s %d 0\n' % (salt, line))
959 else:
959 else:
960 script.append(b'echo %s %d $?\n' % (salt, line))
960 script.append(b'echo %s %d $?\n' % (salt, line))
961
961
962 script = []
962 script = []
963
963
964 # After we run the shell script, we re-unify the script output
964 # After we run the shell script, we re-unify the script output
965 # with non-active parts of the source, with synchronization by our
965 # with non-active parts of the source, with synchronization by our
966 # SALT line number markers. The after table contains the non-active
966 # SALT line number markers. The after table contains the non-active
967 # components, ordered by line number.
967 # components, ordered by line number.
968 after = {}
968 after = {}
969
969
970 # Expected shell script output.
970 # Expected shell script output.
971 expected = {}
971 expected = {}
972
972
973 pos = prepos = -1
973 pos = prepos = -1
974
974
975 # True or False when in a true or false conditional section
975 # True or False when in a true or false conditional section
976 skipping = None
976 skipping = None
977
977
978 # We keep track of whether or not we're in a Python block so we
978 # We keep track of whether or not we're in a Python block so we
979 # can generate the surrounding doctest magic.
979 # can generate the surrounding doctest magic.
980 inpython = False
980 inpython = False
981
981
982 if self._debug:
982 if self._debug:
983 script.append(b'set -x\n')
983 script.append(b'set -x\n')
984 if os.getenv('MSYSTEM'):
984 if os.getenv('MSYSTEM'):
985 script.append(b'alias pwd="pwd -W"\n')
985 script.append(b'alias pwd="pwd -W"\n')
986
986
987 for n, l in enumerate(lines):
987 for n, l in enumerate(lines):
988 if not l.endswith(b'\n'):
988 if not l.endswith(b'\n'):
989 l += b'\n'
989 l += b'\n'
990 if l.startswith(b'#require'):
990 if l.startswith(b'#require'):
991 lsplit = l.split()
991 lsplit = l.split()
992 if len(lsplit) < 2 or lsplit[0] != b'#require':
992 if len(lsplit) < 2 or lsplit[0] != b'#require':
993 after.setdefault(pos, []).append(' !!! invalid #require\n')
993 after.setdefault(pos, []).append(' !!! invalid #require\n')
994 haveresult, message = self._hghave(lsplit[1:])
994 haveresult, message = self._hghave(lsplit[1:])
995 if not haveresult:
995 if not haveresult:
996 script = [b'echo "%s"\nexit 80\n' % message]
996 script = [b'echo "%s"\nexit 80\n' % message]
997 break
997 break
998 after.setdefault(pos, []).append(l)
998 after.setdefault(pos, []).append(l)
999 elif l.startswith(b'#if'):
999 elif l.startswith(b'#if'):
1000 lsplit = l.split()
1000 lsplit = l.split()
1001 if len(lsplit) < 2 or lsplit[0] != b'#if':
1001 if len(lsplit) < 2 or lsplit[0] != b'#if':
1002 after.setdefault(pos, []).append(' !!! invalid #if\n')
1002 after.setdefault(pos, []).append(' !!! invalid #if\n')
1003 if skipping is not None:
1003 if skipping is not None:
1004 after.setdefault(pos, []).append(' !!! nested #if\n')
1004 after.setdefault(pos, []).append(' !!! nested #if\n')
1005 skipping = not self._hghave(lsplit[1:])[0]
1005 skipping = not self._hghave(lsplit[1:])[0]
1006 after.setdefault(pos, []).append(l)
1006 after.setdefault(pos, []).append(l)
1007 elif l.startswith(b'#else'):
1007 elif l.startswith(b'#else'):
1008 if skipping is None:
1008 if skipping is None:
1009 after.setdefault(pos, []).append(' !!! missing #if\n')
1009 after.setdefault(pos, []).append(' !!! missing #if\n')
1010 skipping = not skipping
1010 skipping = not skipping
1011 after.setdefault(pos, []).append(l)
1011 after.setdefault(pos, []).append(l)
1012 elif l.startswith(b'#endif'):
1012 elif l.startswith(b'#endif'):
1013 if skipping is None:
1013 if skipping is None:
1014 after.setdefault(pos, []).append(' !!! missing #if\n')
1014 after.setdefault(pos, []).append(' !!! missing #if\n')
1015 skipping = None
1015 skipping = None
1016 after.setdefault(pos, []).append(l)
1016 after.setdefault(pos, []).append(l)
1017 elif skipping:
1017 elif skipping:
1018 after.setdefault(pos, []).append(l)
1018 after.setdefault(pos, []).append(l)
1019 elif l.startswith(b' >>> '): # python inlines
1019 elif l.startswith(b' >>> '): # python inlines
1020 after.setdefault(pos, []).append(l)
1020 after.setdefault(pos, []).append(l)
1021 prepos = pos
1021 prepos = pos
1022 pos = n
1022 pos = n
1023 if not inpython:
1023 if not inpython:
1024 # We've just entered a Python block. Add the header.
1024 # We've just entered a Python block. Add the header.
1025 inpython = True
1025 inpython = True
1026 addsalt(prepos, False) # Make sure we report the exit code.
1026 addsalt(prepos, False) # Make sure we report the exit code.
1027 script.append(b'%s -m heredoctest <<EOF\n' % PYTHON)
1027 script.append(b'%s -m heredoctest <<EOF\n' % PYTHON)
1028 addsalt(n, True)
1028 addsalt(n, True)
1029 script.append(l[2:])
1029 script.append(l[2:])
1030 elif l.startswith(b' ... '): # python inlines
1030 elif l.startswith(b' ... '): # python inlines
1031 after.setdefault(prepos, []).append(l)
1031 after.setdefault(prepos, []).append(l)
1032 script.append(l[2:])
1032 script.append(l[2:])
1033 elif l.startswith(b' $ '): # commands
1033 elif l.startswith(b' $ '): # commands
1034 if inpython:
1034 if inpython:
1035 script.append(b'EOF\n')
1035 script.append(b'EOF\n')
1036 inpython = False
1036 inpython = False
1037 after.setdefault(pos, []).append(l)
1037 after.setdefault(pos, []).append(l)
1038 prepos = pos
1038 prepos = pos
1039 pos = n
1039 pos = n
1040 addsalt(n, False)
1040 addsalt(n, False)
1041 cmd = l[4:].split()
1041 cmd = l[4:].split()
1042 if len(cmd) == 2 and cmd[0] == b'cd':
1042 if len(cmd) == 2 and cmd[0] == b'cd':
1043 l = b' $ cd %s || exit 1\n' % cmd[1]
1043 l = b' $ cd %s || exit 1\n' % cmd[1]
1044 script.append(l[4:])
1044 script.append(l[4:])
1045 elif l.startswith(b' > '): # continuations
1045 elif l.startswith(b' > '): # continuations
1046 after.setdefault(prepos, []).append(l)
1046 after.setdefault(prepos, []).append(l)
1047 script.append(l[4:])
1047 script.append(l[4:])
1048 elif l.startswith(b' '): # results
1048 elif l.startswith(b' '): # results
1049 # Queue up a list of expected results.
1049 # Queue up a list of expected results.
1050 expected.setdefault(pos, []).append(l[2:])
1050 expected.setdefault(pos, []).append(l[2:])
1051 else:
1051 else:
1052 if inpython:
1052 if inpython:
1053 script.append(b'EOF\n')
1053 script.append(b'EOF\n')
1054 inpython = False
1054 inpython = False
1055 # Non-command/result. Queue up for merged output.
1055 # Non-command/result. Queue up for merged output.
1056 after.setdefault(pos, []).append(l)
1056 after.setdefault(pos, []).append(l)
1057
1057
1058 if inpython:
1058 if inpython:
1059 script.append(b'EOF\n')
1059 script.append(b'EOF\n')
1060 if skipping is not None:
1060 if skipping is not None:
1061 after.setdefault(pos, []).append(' !!! missing #endif\n')
1061 after.setdefault(pos, []).append(' !!! missing #endif\n')
1062 addsalt(n + 1, False)
1062 addsalt(n + 1, False)
1063
1063
1064 return salt, script, after, expected
1064 return salt, script, after, expected
1065
1065
1066 def _processoutput(self, exitcode, output, salt, after, expected):
1066 def _processoutput(self, exitcode, output, salt, after, expected):
1067 # Merge the script output back into a unified test.
1067 # Merge the script output back into a unified test.
1068 warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
1068 warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
1069 if exitcode != 0:
1069 if exitcode != 0:
1070 warnonly = 3
1070 warnonly = 3
1071
1071
1072 pos = -1
1072 pos = -1
1073 postout = []
1073 postout = []
1074 for l in output:
1074 for l in output:
1075 lout, lcmd = l, None
1075 lout, lcmd = l, None
1076 if salt in l:
1076 if salt in l:
1077 lout, lcmd = l.split(salt, 1)
1077 lout, lcmd = l.split(salt, 1)
1078
1078
1079 while lout:
1079 while lout:
1080 if not lout.endswith(b'\n'):
1080 if not lout.endswith(b'\n'):
1081 lout += b' (no-eol)\n'
1081 lout += b' (no-eol)\n'
1082
1082
1083 # Find the expected output at the current position.
1083 # Find the expected output at the current position.
1084 el = None
1084 el = None
1085 if expected.get(pos, None):
1085 if expected.get(pos, None):
1086 el = expected[pos].pop(0)
1086 el = expected[pos].pop(0)
1087
1087
1088 r = TTest.linematch(el, lout)
1088 r = TTest.linematch(el, lout)
1089 if isinstance(r, str):
1089 if isinstance(r, str):
1090 if r == '+glob':
1090 if r == '+glob':
1091 lout = el[:-1] + ' (glob)\n'
1091 lout = el[:-1] + ' (glob)\n'
1092 r = '' # Warn only this line.
1092 r = '' # Warn only this line.
1093 elif r == '-glob':
1093 elif r == '-glob':
1094 lout = ''.join(el.rsplit(' (glob)', 1))
1094 lout = ''.join(el.rsplit(' (glob)', 1))
1095 r = '' # Warn only this line.
1095 r = '' # Warn only this line.
1096 elif r == "retry":
1096 elif r == "retry":
1097 postout.append(b' ' + el)
1097 postout.append(b' ' + el)
1098 continue
1098 continue
1099 else:
1099 else:
1100 log('\ninfo, unknown linematch result: %r\n' % r)
1100 log('\ninfo, unknown linematch result: %r\n' % r)
1101 r = False
1101 r = False
1102 if r:
1102 if r:
1103 postout.append(b' ' + el)
1103 postout.append(b' ' + el)
1104 else:
1104 else:
1105 if self.NEEDESCAPE(lout):
1105 if self.NEEDESCAPE(lout):
1106 lout = TTest._stringescape(b'%s (esc)\n' %
1106 lout = TTest._stringescape(b'%s (esc)\n' %
1107 lout.rstrip(b'\n'))
1107 lout.rstrip(b'\n'))
1108 postout.append(b' ' + lout) # Let diff deal with it.
1108 postout.append(b' ' + lout) # Let diff deal with it.
1109 if r != '': # If line failed.
1109 if r != '': # If line failed.
1110 warnonly = 3 # for sure not
1110 warnonly = 3 # for sure not
1111 elif warnonly == 1: # Is "not yet" and line is warn only.
1111 elif warnonly == 1: # Is "not yet" and line is warn only.
1112 warnonly = 2 # Yes do warn.
1112 warnonly = 2 # Yes do warn.
1113 break
1113 break
1114
1114
1115 # clean up any optional leftovers
1115 # clean up any optional leftovers
1116 while expected.get(pos, None):
1116 while expected.get(pos, None):
1117 el = expected[pos].pop(0)
1117 el = expected[pos].pop(0)
1118 if not el.endswith(b" (?)\n"):
1118 if not el.endswith(b" (?)\n"):
1119 expected[pos].insert(0, el)
1119 expected[pos].insert(0, el)
1120 break
1120 break
1121 postout.append(b' ' + el)
1121 postout.append(b' ' + el)
1122
1122
1123 if lcmd:
1123 if lcmd:
1124 # Add on last return code.
1124 # Add on last return code.
1125 ret = int(lcmd.split()[1])
1125 ret = int(lcmd.split()[1])
1126 if ret != 0:
1126 if ret != 0:
1127 postout.append(b' [%d]\n' % ret)
1127 postout.append(b' [%d]\n' % ret)
1128 if pos in after:
1128 if pos in after:
1129 # Merge in non-active test bits.
1129 # Merge in non-active test bits.
1130 postout += after.pop(pos)
1130 postout += after.pop(pos)
1131 pos = int(lcmd.split()[0])
1131 pos = int(lcmd.split()[0])
1132
1132
1133 if pos in after:
1133 if pos in after:
1134 postout += after.pop(pos)
1134 postout += after.pop(pos)
1135
1135
1136 if warnonly == 2:
1136 if warnonly == 2:
1137 exitcode = False # Set exitcode to warned.
1137 exitcode = False # Set exitcode to warned.
1138
1138
1139 return exitcode, postout
1139 return exitcode, postout
1140
1140
1141 @staticmethod
1141 @staticmethod
1142 def rematch(el, l):
1142 def rematch(el, l):
1143 try:
1143 try:
1144 # use \Z to ensure that the regex matches to the end of the string
1144 # use \Z to ensure that the regex matches to the end of the string
1145 if os.name == 'nt':
1145 if os.name == 'nt':
1146 return re.match(el + br'\r?\n\Z', l)
1146 return re.match(el + br'\r?\n\Z', l)
1147 return re.match(el + br'\n\Z', l)
1147 return re.match(el + br'\n\Z', l)
1148 except re.error:
1148 except re.error:
1149 # el is an invalid regex
1149 # el is an invalid regex
1150 return False
1150 return False
1151
1151
1152 @staticmethod
1152 @staticmethod
1153 def globmatch(el, l):
1153 def globmatch(el, l):
1154 # The only supported special characters are * and ? plus / which also
1154 # The only supported special characters are * and ? plus / which also
1155 # matches \ on windows. Escaping of these characters is supported.
1155 # matches \ on windows. Escaping of these characters is supported.
1156 if el + b'\n' == l:
1156 if el + b'\n' == l:
1157 if os.altsep:
1157 if os.altsep:
1158 # matching on "/" is not needed for this line
1158 # matching on "/" is not needed for this line
1159 for pat in checkcodeglobpats:
1159 for pat in checkcodeglobpats:
1160 if pat.match(el):
1160 if pat.match(el):
1161 return True
1161 return True
1162 return b'-glob'
1162 return b'-glob'
1163 return True
1163 return True
1164 i, n = 0, len(el)
1164 i, n = 0, len(el)
1165 res = b''
1165 res = b''
1166 while i < n:
1166 while i < n:
1167 c = el[i:i + 1]
1167 c = el[i:i + 1]
1168 i += 1
1168 i += 1
1169 if c == b'\\' and i < n and el[i:i + 1] in b'*?\\/':
1169 if c == b'\\' and i < n and el[i:i + 1] in b'*?\\/':
1170 res += el[i - 1:i + 1]
1170 res += el[i - 1:i + 1]
1171 i += 1
1171 i += 1
1172 elif c == b'*':
1172 elif c == b'*':
1173 res += b'.*'
1173 res += b'.*'
1174 elif c == b'?':
1174 elif c == b'?':
1175 res += b'.'
1175 res += b'.'
1176 elif c == b'/' and os.altsep:
1176 elif c == b'/' and os.altsep:
1177 res += b'[/\\\\]'
1177 res += b'[/\\\\]'
1178 else:
1178 else:
1179 res += re.escape(c)
1179 res += re.escape(c)
1180 return TTest.rematch(res, l)
1180 return TTest.rematch(res, l)
1181
1181
1182 @staticmethod
1182 @staticmethod
1183 def linematch(el, l):
1183 def linematch(el, l):
1184 retry = False
1184 retry = False
1185 if el == l: # perfect match (fast)
1185 if el == l: # perfect match (fast)
1186 return True
1186 return True
1187 if el:
1187 if el:
1188 if el.endswith(b" (?)\n"):
1188 if el.endswith(b" (?)\n"):
1189 retry = "retry"
1189 retry = "retry"
1190 el = el[:-5] + "\n"
1190 el = el[:-5] + "\n"
1191 if el.endswith(b" (esc)\n"):
1191 if el.endswith(b" (esc)\n"):
1192 if PYTHON3:
1192 if PYTHON3:
1193 el = el[:-7].decode('unicode_escape') + '\n'
1193 el = el[:-7].decode('unicode_escape') + '\n'
1194 el = el.encode('utf-8')
1194 el = el.encode('utf-8')
1195 else:
1195 else:
1196 el = el[:-7].decode('string-escape') + '\n'
1196 el = el[:-7].decode('string-escape') + '\n'
1197 if el == l or os.name == 'nt' and el[:-1] + b'\r\n' == l:
1197 if el == l or os.name == 'nt' and el[:-1] + b'\r\n' == l:
1198 return True
1198 return True
1199 if el.endswith(b" (re)\n"):
1199 if el.endswith(b" (re)\n"):
1200 return TTest.rematch(el[:-6], l) or retry
1200 return TTest.rematch(el[:-6], l) or retry
1201 if el.endswith(b" (glob)\n"):
1201 if el.endswith(b" (glob)\n"):
1202 # ignore '(glob)' added to l by 'replacements'
1202 # ignore '(glob)' added to l by 'replacements'
1203 if l.endswith(b" (glob)\n"):
1203 if l.endswith(b" (glob)\n"):
1204 l = l[:-8] + b"\n"
1204 l = l[:-8] + b"\n"
1205 return TTest.globmatch(el[:-8], l)
1205 return TTest.globmatch(el[:-8], l)
1206 if os.altsep and l.replace(b'\\', b'/') == el:
1206 if os.altsep and l.replace(b'\\', b'/') == el:
1207 return b'+glob'
1207 return b'+glob'
1208 return retry
1208 return retry
1209
1209
1210 @staticmethod
1210 @staticmethod
1211 def parsehghaveoutput(lines):
1211 def parsehghaveoutput(lines):
1212 '''Parse hghave log lines.
1212 '''Parse hghave log lines.
1213
1213
1214 Return tuple of lists (missing, failed):
1214 Return tuple of lists (missing, failed):
1215 * the missing/unknown features
1215 * the missing/unknown features
1216 * the features for which existence check failed'''
1216 * the features for which existence check failed'''
1217 missing = []
1217 missing = []
1218 failed = []
1218 failed = []
1219 for line in lines:
1219 for line in lines:
1220 if line.startswith(TTest.SKIPPED_PREFIX):
1220 if line.startswith(TTest.SKIPPED_PREFIX):
1221 line = line.splitlines()[0]
1221 line = line.splitlines()[0]
1222 missing.append(line[len(TTest.SKIPPED_PREFIX):])
1222 missing.append(line[len(TTest.SKIPPED_PREFIX):])
1223 elif line.startswith(TTest.FAILED_PREFIX):
1223 elif line.startswith(TTest.FAILED_PREFIX):
1224 line = line.splitlines()[0]
1224 line = line.splitlines()[0]
1225 failed.append(line[len(TTest.FAILED_PREFIX):])
1225 failed.append(line[len(TTest.FAILED_PREFIX):])
1226
1226
1227 return missing, failed
1227 return missing, failed
1228
1228
1229 @staticmethod
1229 @staticmethod
1230 def _escapef(m):
1230 def _escapef(m):
1231 return TTest.ESCAPEMAP[m.group(0)]
1231 return TTest.ESCAPEMAP[m.group(0)]
1232
1232
1233 @staticmethod
1233 @staticmethod
1234 def _stringescape(s):
1234 def _stringescape(s):
1235 return TTest.ESCAPESUB(TTest._escapef, s)
1235 return TTest.ESCAPESUB(TTest._escapef, s)
1236
1236
1237 iolock = threading.RLock()
1237 iolock = threading.RLock()
1238
1238
1239 class SkipTest(Exception):
1239 class SkipTest(Exception):
1240 """Raised to indicate that a test is to be skipped."""
1240 """Raised to indicate that a test is to be skipped."""
1241
1241
1242 class IgnoreTest(Exception):
1242 class IgnoreTest(Exception):
1243 """Raised to indicate that a test is to be ignored."""
1243 """Raised to indicate that a test is to be ignored."""
1244
1244
1245 class WarnTest(Exception):
1245 class WarnTest(Exception):
1246 """Raised to indicate that a test warned."""
1246 """Raised to indicate that a test warned."""
1247
1247
1248 class ReportedTest(Exception):
1248 class ReportedTest(Exception):
1249 """Raised to indicate that a test already reported."""
1249 """Raised to indicate that a test already reported."""
1250
1250
1251 class TestResult(unittest._TextTestResult):
1251 class TestResult(unittest._TextTestResult):
1252 """Holds results when executing via unittest."""
1252 """Holds results when executing via unittest."""
1253 # Don't worry too much about accessing the non-public _TextTestResult.
1253 # Don't worry too much about accessing the non-public _TextTestResult.
1254 # It is relatively common in Python testing tools.
1254 # It is relatively common in Python testing tools.
1255 def __init__(self, options, *args, **kwargs):
1255 def __init__(self, options, *args, **kwargs):
1256 super(TestResult, self).__init__(*args, **kwargs)
1256 super(TestResult, self).__init__(*args, **kwargs)
1257
1257
1258 self._options = options
1258 self._options = options
1259
1259
1260 # unittest.TestResult didn't have skipped until 2.7. We need to
1260 # unittest.TestResult didn't have skipped until 2.7. We need to
1261 # polyfill it.
1261 # polyfill it.
1262 self.skipped = []
1262 self.skipped = []
1263
1263
1264 # We have a custom "ignored" result that isn't present in any Python
1264 # We have a custom "ignored" result that isn't present in any Python
1265 # unittest implementation. It is very similar to skipped. It may make
1265 # unittest implementation. It is very similar to skipped. It may make
1266 # sense to map it into skip some day.
1266 # sense to map it into skip some day.
1267 self.ignored = []
1267 self.ignored = []
1268
1268
1269 # We have a custom "warned" result that isn't present in any Python
1269 # We have a custom "warned" result that isn't present in any Python
1270 # unittest implementation. It is very similar to failed. It may make
1270 # unittest implementation. It is very similar to failed. It may make
1271 # sense to map it into fail some day.
1271 # sense to map it into fail some day.
1272 self.warned = []
1272 self.warned = []
1273
1273
1274 self.times = []
1274 self.times = []
1275 self._firststarttime = None
1275 self._firststarttime = None
1276 # Data stored for the benefit of generating xunit reports.
1276 # Data stored for the benefit of generating xunit reports.
1277 self.successes = []
1277 self.successes = []
1278 self.faildata = {}
1278 self.faildata = {}
1279
1279
1280 def addFailure(self, test, reason):
1280 def addFailure(self, test, reason):
1281 self.failures.append((test, reason))
1281 self.failures.append((test, reason))
1282
1282
1283 if self._options.first:
1283 if self._options.first:
1284 self.stop()
1284 self.stop()
1285 else:
1285 else:
1286 with iolock:
1286 with iolock:
1287 if reason == "timed out":
1287 if reason == "timed out":
1288 self.stream.write('t')
1288 self.stream.write('t')
1289 else:
1289 else:
1290 if not self._options.nodiff:
1290 if not self._options.nodiff:
1291 self.stream.write('\nERROR: %s output changed\n' % test)
1291 self.stream.write('\nERROR: %s output changed\n' % test)
1292 self.stream.write('!')
1292 self.stream.write('!')
1293
1293
1294 self.stream.flush()
1294 self.stream.flush()
1295
1295
1296 def addSuccess(self, test):
1296 def addSuccess(self, test):
1297 with iolock:
1297 with iolock:
1298 super(TestResult, self).addSuccess(test)
1298 super(TestResult, self).addSuccess(test)
1299 self.successes.append(test)
1299 self.successes.append(test)
1300
1300
1301 def addError(self, test, err):
1301 def addError(self, test, err):
1302 super(TestResult, self).addError(test, err)
1302 super(TestResult, self).addError(test, err)
1303 if self._options.first:
1303 if self._options.first:
1304 self.stop()
1304 self.stop()
1305
1305
1306 # Polyfill.
1306 # Polyfill.
1307 def addSkip(self, test, reason):
1307 def addSkip(self, test, reason):
1308 self.skipped.append((test, reason))
1308 self.skipped.append((test, reason))
1309 with iolock:
1309 with iolock:
1310 if self.showAll:
1310 if self.showAll:
1311 self.stream.writeln('skipped %s' % reason)
1311 self.stream.writeln('skipped %s' % reason)
1312 else:
1312 else:
1313 self.stream.write('s')
1313 self.stream.write('s')
1314 self.stream.flush()
1314 self.stream.flush()
1315
1315
1316 def addIgnore(self, test, reason):
1316 def addIgnore(self, test, reason):
1317 self.ignored.append((test, reason))
1317 self.ignored.append((test, reason))
1318 with iolock:
1318 with iolock:
1319 if self.showAll:
1319 if self.showAll:
1320 self.stream.writeln('ignored %s' % reason)
1320 self.stream.writeln('ignored %s' % reason)
1321 else:
1321 else:
1322 if reason not in ('not retesting', "doesn't match keyword"):
1322 if reason not in ('not retesting', "doesn't match keyword"):
1323 self.stream.write('i')
1323 self.stream.write('i')
1324 else:
1324 else:
1325 self.testsRun += 1
1325 self.testsRun += 1
1326 self.stream.flush()
1326 self.stream.flush()
1327
1327
1328 def addWarn(self, test, reason):
1328 def addWarn(self, test, reason):
1329 self.warned.append((test, reason))
1329 self.warned.append((test, reason))
1330
1330
1331 if self._options.first:
1331 if self._options.first:
1332 self.stop()
1332 self.stop()
1333
1333
1334 with iolock:
1334 with iolock:
1335 if self.showAll:
1335 if self.showAll:
1336 self.stream.writeln('warned %s' % reason)
1336 self.stream.writeln('warned %s' % reason)
1337 else:
1337 else:
1338 self.stream.write('~')
1338 self.stream.write('~')
1339 self.stream.flush()
1339 self.stream.flush()
1340
1340
1341 def addOutputMismatch(self, test, ret, got, expected):
1341 def addOutputMismatch(self, test, ret, got, expected):
1342 """Record a mismatch in test output for a particular test."""
1342 """Record a mismatch in test output for a particular test."""
1343 if self.shouldStop:
1343 if self.shouldStop:
1344 # don't print, some other test case already failed and
1344 # don't print, some other test case already failed and
1345 # printed, we're just stale and probably failed due to our
1345 # printed, we're just stale and probably failed due to our
1346 # temp dir getting cleaned up.
1346 # temp dir getting cleaned up.
1347 return
1347 return
1348
1348
1349 accepted = False
1349 accepted = False
1350 failed = False
1350 failed = False
1351 lines = []
1351 lines = []
1352
1352
1353 with iolock:
1353 with iolock:
1354 if self._options.nodiff:
1354 if self._options.nodiff:
1355 pass
1355 pass
1356 elif self._options.view:
1356 elif self._options.view:
1357 v = self._options.view
1357 v = self._options.view
1358 if PYTHON3:
1358 if PYTHON3:
1359 v = _bytespath(v)
1359 v = _bytespath(v)
1360 os.system(b"%s %s %s" %
1360 os.system(b"%s %s %s" %
1361 (v, test.refpath, test.errpath))
1361 (v, test.refpath, test.errpath))
1362 else:
1362 else:
1363 servefail, lines = getdiff(expected, got,
1363 servefail, lines = getdiff(expected, got,
1364 test.refpath, test.errpath)
1364 test.refpath, test.errpath)
1365 if servefail:
1365 if servefail:
1366 self.addFailure(
1366 self.addFailure(
1367 test,
1367 test,
1368 'server failed to start (HGPORT=%s)' % test._startport)
1368 'server failed to start (HGPORT=%s)' % test._startport)
1369 raise ReportedTest('server failed to start')
1369 raise ReportedTest('server failed to start')
1370 else:
1370 else:
1371 self.stream.write('\n')
1371 self.stream.write('\n')
1372 for line in lines:
1372 for line in lines:
1373 if PYTHON3:
1373 if PYTHON3:
1374 self.stream.flush()
1374 self.stream.flush()
1375 self.stream.buffer.write(line)
1375 self.stream.buffer.write(line)
1376 self.stream.buffer.flush()
1376 self.stream.buffer.flush()
1377 else:
1377 else:
1378 self.stream.write(line)
1378 self.stream.write(line)
1379 self.stream.flush()
1379 self.stream.flush()
1380
1380
1381 # handle interactive prompt without releasing iolock
1381 # handle interactive prompt without releasing iolock
1382 if self._options.interactive:
1382 if self._options.interactive:
1383 self.stream.write('Accept this change? [n] ')
1383 self.stream.write('Accept this change? [n] ')
1384 answer = sys.stdin.readline().strip()
1384 answer = sys.stdin.readline().strip()
1385 if answer.lower() in ('y', 'yes'):
1385 if answer.lower() in ('y', 'yes'):
1386 if test.name.endswith('.t'):
1386 if test.name.endswith('.t'):
1387 rename(test.errpath, test.path)
1387 rename(test.errpath, test.path)
1388 else:
1388 else:
1389 rename(test.errpath, '%s.out' % test.path)
1389 rename(test.errpath, '%s.out' % test.path)
1390 accepted = True
1390 accepted = True
1391 if not accepted and not failed:
1391 if not accepted and not failed:
1392 self.faildata[test.name] = b''.join(lines)
1392 self.faildata[test.name] = b''.join(lines)
1393
1393
1394 return accepted
1394 return accepted
1395
1395
1396 def startTest(self, test):
1396 def startTest(self, test):
1397 super(TestResult, self).startTest(test)
1397 super(TestResult, self).startTest(test)
1398
1398
1399 # os.times module computes the user time and system time spent by
1399 # os.times module computes the user time and system time spent by
1400 # child's processes along with real elapsed time taken by a process.
1400 # child's processes along with real elapsed time taken by a process.
1401 # This module has one limitation. It can only work for Linux user
1401 # This module has one limitation. It can only work for Linux user
1402 # and not for Windows.
1402 # and not for Windows.
1403 test.started = os.times()
1403 test.started = os.times()
1404 if self._firststarttime is None: # thread racy but irrelevant
1404 if self._firststarttime is None: # thread racy but irrelevant
1405 self._firststarttime = test.started[4]
1405 self._firststarttime = test.started[4]
1406
1406
1407 def stopTest(self, test, interrupted=False):
1407 def stopTest(self, test, interrupted=False):
1408 super(TestResult, self).stopTest(test)
1408 super(TestResult, self).stopTest(test)
1409
1409
1410 test.stopped = os.times()
1410 test.stopped = os.times()
1411
1411
1412 starttime = test.started
1412 starttime = test.started
1413 endtime = test.stopped
1413 endtime = test.stopped
1414 origin = self._firststarttime
1414 origin = self._firststarttime
1415 self.times.append((test.name,
1415 self.times.append((test.name,
1416 endtime[2] - starttime[2], # user space CPU time
1416 endtime[2] - starttime[2], # user space CPU time
1417 endtime[3] - starttime[3], # sys space CPU time
1417 endtime[3] - starttime[3], # sys space CPU time
1418 endtime[4] - starttime[4], # real time
1418 endtime[4] - starttime[4], # real time
1419 starttime[4] - origin, # start date in run context
1419 starttime[4] - origin, # start date in run context
1420 endtime[4] - origin, # end date in run context
1420 endtime[4] - origin, # end date in run context
1421 ))
1421 ))
1422
1422
1423 if interrupted:
1423 if interrupted:
1424 with iolock:
1424 with iolock:
1425 self.stream.writeln('INTERRUPTED: %s (after %d seconds)' % (
1425 self.stream.writeln('INTERRUPTED: %s (after %d seconds)' % (
1426 test.name, self.times[-1][3]))
1426 test.name, self.times[-1][3]))
1427
1427
1428 class TestSuite(unittest.TestSuite):
1428 class TestSuite(unittest.TestSuite):
1429 """Custom unittest TestSuite that knows how to execute Mercurial tests."""
1429 """Custom unittest TestSuite that knows how to execute Mercurial tests."""
1430
1430
1431 def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None,
1431 def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None,
1432 retest=False, keywords=None, loop=False, runs_per_test=1,
1432 retest=False, keywords=None, loop=False, runs_per_test=1,
1433 loadtest=None, showchannels=False,
1433 loadtest=None, showchannels=False,
1434 *args, **kwargs):
1434 *args, **kwargs):
1435 """Create a new instance that can run tests with a configuration.
1435 """Create a new instance that can run tests with a configuration.
1436
1436
1437 testdir specifies the directory where tests are executed from. This
1437 testdir specifies the directory where tests are executed from. This
1438 is typically the ``tests`` directory from Mercurial's source
1438 is typically the ``tests`` directory from Mercurial's source
1439 repository.
1439 repository.
1440
1440
1441 jobs specifies the number of jobs to run concurrently. Each test
1441 jobs specifies the number of jobs to run concurrently. Each test
1442 executes on its own thread. Tests actually spawn new processes, so
1442 executes on its own thread. Tests actually spawn new processes, so
1443 state mutation should not be an issue.
1443 state mutation should not be an issue.
1444
1444
1445 whitelist and blacklist denote tests that have been whitelisted and
1445 whitelist and blacklist denote tests that have been whitelisted and
1446 blacklisted, respectively. These arguments don't belong in TestSuite.
1446 blacklisted, respectively. These arguments don't belong in TestSuite.
1447 Instead, whitelist and blacklist should be handled by the thing that
1447 Instead, whitelist and blacklist should be handled by the thing that
1448 populates the TestSuite with tests. They are present to preserve
1448 populates the TestSuite with tests. They are present to preserve
1449 backwards compatible behavior which reports skipped tests as part
1449 backwards compatible behavior which reports skipped tests as part
1450 of the results.
1450 of the results.
1451
1451
1452 retest denotes whether to retest failed tests. This arguably belongs
1452 retest denotes whether to retest failed tests. This arguably belongs
1453 outside of TestSuite.
1453 outside of TestSuite.
1454
1454
1455 keywords denotes key words that will be used to filter which tests
1455 keywords denotes key words that will be used to filter which tests
1456 to execute. This arguably belongs outside of TestSuite.
1456 to execute. This arguably belongs outside of TestSuite.
1457
1457
1458 loop denotes whether to loop over tests forever.
1458 loop denotes whether to loop over tests forever.
1459 """
1459 """
1460 super(TestSuite, self).__init__(*args, **kwargs)
1460 super(TestSuite, self).__init__(*args, **kwargs)
1461
1461
1462 self._jobs = jobs
1462 self._jobs = jobs
1463 self._whitelist = whitelist
1463 self._whitelist = whitelist
1464 self._blacklist = blacklist
1464 self._blacklist = blacklist
1465 self._retest = retest
1465 self._retest = retest
1466 self._keywords = keywords
1466 self._keywords = keywords
1467 self._loop = loop
1467 self._loop = loop
1468 self._runs_per_test = runs_per_test
1468 self._runs_per_test = runs_per_test
1469 self._loadtest = loadtest
1469 self._loadtest = loadtest
1470 self._showchannels = showchannels
1470 self._showchannels = showchannels
1471
1471
1472 def run(self, result):
1472 def run(self, result):
1473 # We have a number of filters that need to be applied. We do this
1473 # We have a number of filters that need to be applied. We do this
1474 # here instead of inside Test because it makes the running logic for
1474 # here instead of inside Test because it makes the running logic for
1475 # Test simpler.
1475 # Test simpler.
1476 tests = []
1476 tests = []
1477 num_tests = [0]
1477 num_tests = [0]
1478 for test in self._tests:
1478 for test in self._tests:
1479 def get():
1479 def get():
1480 num_tests[0] += 1
1480 num_tests[0] += 1
1481 if getattr(test, 'should_reload', False):
1481 if getattr(test, 'should_reload', False):
1482 return self._loadtest(test.bname, num_tests[0])
1482 return self._loadtest(test.bname, num_tests[0])
1483 return test
1483 return test
1484 if not os.path.exists(test.path):
1484 if not os.path.exists(test.path):
1485 result.addSkip(test, "Doesn't exist")
1485 result.addSkip(test, "Doesn't exist")
1486 continue
1486 continue
1487
1487
1488 if not (self._whitelist and test.name in self._whitelist):
1488 if not (self._whitelist and test.name in self._whitelist):
1489 if self._blacklist and test.bname in self._blacklist:
1489 if self._blacklist and test.bname in self._blacklist:
1490 result.addSkip(test, 'blacklisted')
1490 result.addSkip(test, 'blacklisted')
1491 continue
1491 continue
1492
1492
1493 if self._retest and not os.path.exists(test.errpath):
1493 if self._retest and not os.path.exists(test.errpath):
1494 result.addIgnore(test, 'not retesting')
1494 result.addIgnore(test, 'not retesting')
1495 continue
1495 continue
1496
1496
1497 if self._keywords:
1497 if self._keywords:
1498 f = open(test.path, 'rb')
1498 f = open(test.path, 'rb')
1499 t = f.read().lower() + test.bname.lower()
1499 t = f.read().lower() + test.bname.lower()
1500 f.close()
1500 f.close()
1501 ignored = False
1501 ignored = False
1502 for k in self._keywords.lower().split():
1502 for k in self._keywords.lower().split():
1503 if k not in t:
1503 if k not in t:
1504 result.addIgnore(test, "doesn't match keyword")
1504 result.addIgnore(test, "doesn't match keyword")
1505 ignored = True
1505 ignored = True
1506 break
1506 break
1507
1507
1508 if ignored:
1508 if ignored:
1509 continue
1509 continue
1510 for _ in xrange(self._runs_per_test):
1510 for _ in xrange(self._runs_per_test):
1511 tests.append(get())
1511 tests.append(get())
1512
1512
1513 runtests = list(tests)
1513 runtests = list(tests)
1514 done = queue.Queue()
1514 done = queue.Queue()
1515 running = 0
1515 running = 0
1516
1516
1517 channels = [""] * self._jobs
1517 channels = [""] * self._jobs
1518
1518
1519 def job(test, result):
1519 def job(test, result):
1520 for n, v in enumerate(channels):
1520 for n, v in enumerate(channels):
1521 if not v:
1521 if not v:
1522 channel = n
1522 channel = n
1523 break
1523 break
1524 channels[channel] = "=" + test.name[5:].split(".")[0]
1524 channels[channel] = "=" + test.name[5:].split(".")[0]
1525 try:
1525 try:
1526 test(result)
1526 test(result)
1527 done.put(None)
1527 done.put(None)
1528 except KeyboardInterrupt:
1528 except KeyboardInterrupt:
1529 pass
1529 pass
1530 except: # re-raises
1530 except: # re-raises
1531 done.put(('!', test, 'run-test raised an error, see traceback'))
1531 done.put(('!', test, 'run-test raised an error, see traceback'))
1532 raise
1532 raise
1533 channels[channel] = ''
1533 channels[channel] = ''
1534
1534
1535 def stat():
1535 def stat():
1536 count = 0
1536 count = 0
1537 while channels:
1537 while channels:
1538 d = '\n%03s ' % count
1538 d = '\n%03s ' % count
1539 for n, v in enumerate(channels):
1539 for n, v in enumerate(channels):
1540 if v:
1540 if v:
1541 d += v[0]
1541 d += v[0]
1542 channels[n] = v[1:] or '.'
1542 channels[n] = v[1:] or '.'
1543 else:
1543 else:
1544 d += ' '
1544 d += ' '
1545 d += ' '
1545 d += ' '
1546 with iolock:
1546 with iolock:
1547 sys.stdout.write(d + ' ')
1547 sys.stdout.write(d + ' ')
1548 sys.stdout.flush()
1548 sys.stdout.flush()
1549 for x in xrange(10):
1549 for x in xrange(10):
1550 if channels:
1550 if channels:
1551 time.sleep(.1)
1551 time.sleep(.1)
1552 count += 1
1552 count += 1
1553
1553
1554 stoppedearly = False
1554 stoppedearly = False
1555
1555
1556 if self._showchannels:
1556 if self._showchannels:
1557 statthread = threading.Thread(target=stat, name="stat")
1557 statthread = threading.Thread(target=stat, name="stat")
1558 statthread.start()
1558 statthread.start()
1559
1559
1560 try:
1560 try:
1561 while tests or running:
1561 if len(tests) == 1:
1562 if not done.empty() or running == self._jobs or not tests:
1562 test = tests.pop(0)
1563 try:
1563 test.run(result)
1564 done.get(True, 1)
1564 else:
1565 running -= 1
1565 while tests or running:
1566 if result and result.shouldStop:
1566 if not done.empty() or running == self._jobs or not tests:
1567 stoppedearly = True
1567 try:
1568 break
1568 done.get(True, 1)
1569 except queue.Empty:
1569 running -= 1
1570 continue
1570 if result and result.shouldStop:
1571 if tests and not running == self._jobs:
1571 stoppedearly = True
1572 test = tests.pop(0)
1572 break
1573 if self._loop:
1573 except queue.Empty:
1574 if getattr(test, 'should_reload', False):
1574 continue
1575 num_tests[0] += 1
1575 if tests and not running == self._jobs:
1576 tests.append(
1576 test = tests.pop(0)
1577 self._loadtest(test.name, num_tests[0]))
1577 if self._loop:
1578 else:
1578 if getattr(test, 'should_reload', False):
1579 tests.append(test)
1579 num_tests[0] += 1
1580 t = threading.Thread(target=job, name=test.name,
1580 tests.append(
1581 args=(test, result))
1581 self._loadtest(test.name, num_tests[0]))
1582 t.start()
1582 else:
1583 running += 1
1583 tests.append(test)
1584 t = threading.Thread(target=job, name=test.name,
1585 args=(test, result))
1586 t.start()
1587 running += 1
1584
1588
1585 # If we stop early we still need to wait on started tests to
1589 # If we stop early we still need to wait on started tests to
1586 # finish. Otherwise, there is a race between the test completing
1590 # finish. Otherwise, there is a race between the test completing
1587 # and the test's cleanup code running. This could result in the
1591 # and the test's cleanup code running. This could result in the
1588 # test reporting incorrect.
1592 # test reporting incorrect.
1589 if stoppedearly:
1593 if stoppedearly:
1590 while running:
1594 while running:
1591 try:
1595 try:
1592 done.get(True, 1)
1596 done.get(True, 1)
1593 running -= 1
1597 running -= 1
1594 except queue.Empty:
1598 except queue.Empty:
1595 continue
1599 continue
1596 except KeyboardInterrupt:
1600 except KeyboardInterrupt:
1597 for test in runtests:
1601 for test in runtests:
1598 test.abort()
1602 test.abort()
1599
1603
1600 channels = []
1604 channels = []
1601
1605
1602 return result
1606 return result
1603
1607
1604 # Save the most recent 5 wall-clock runtimes of each test to a
1608 # Save the most recent 5 wall-clock runtimes of each test to a
1605 # human-readable text file named .testtimes. Tests are sorted
1609 # human-readable text file named .testtimes. Tests are sorted
1606 # alphabetically, while times for each test are listed from oldest to
1610 # alphabetically, while times for each test are listed from oldest to
1607 # newest.
1611 # newest.
1608
1612
1609 def loadtimes(testdir):
1613 def loadtimes(testdir):
1610 times = []
1614 times = []
1611 try:
1615 try:
1612 with open(os.path.join(testdir, '.testtimes-')) as fp:
1616 with open(os.path.join(testdir, '.testtimes-')) as fp:
1613 for line in fp:
1617 for line in fp:
1614 ts = line.split()
1618 ts = line.split()
1615 times.append((ts[0], [float(t) for t in ts[1:]]))
1619 times.append((ts[0], [float(t) for t in ts[1:]]))
1616 except IOError as err:
1620 except IOError as err:
1617 if err.errno != errno.ENOENT:
1621 if err.errno != errno.ENOENT:
1618 raise
1622 raise
1619 return times
1623 return times
1620
1624
1621 def savetimes(testdir, result):
1625 def savetimes(testdir, result):
1622 saved = dict(loadtimes(testdir))
1626 saved = dict(loadtimes(testdir))
1623 maxruns = 5
1627 maxruns = 5
1624 skipped = set([str(t[0]) for t in result.skipped])
1628 skipped = set([str(t[0]) for t in result.skipped])
1625 for tdata in result.times:
1629 for tdata in result.times:
1626 test, real = tdata[0], tdata[3]
1630 test, real = tdata[0], tdata[3]
1627 if test not in skipped:
1631 if test not in skipped:
1628 ts = saved.setdefault(test, [])
1632 ts = saved.setdefault(test, [])
1629 ts.append(real)
1633 ts.append(real)
1630 ts[:] = ts[-maxruns:]
1634 ts[:] = ts[-maxruns:]
1631
1635
1632 fd, tmpname = tempfile.mkstemp(prefix='.testtimes',
1636 fd, tmpname = tempfile.mkstemp(prefix='.testtimes',
1633 dir=testdir, text=True)
1637 dir=testdir, text=True)
1634 with os.fdopen(fd, 'w') as fp:
1638 with os.fdopen(fd, 'w') as fp:
1635 for name, ts in sorted(saved.iteritems()):
1639 for name, ts in sorted(saved.iteritems()):
1636 fp.write('%s %s\n' % (name, ' '.join(['%.3f' % (t,) for t in ts])))
1640 fp.write('%s %s\n' % (name, ' '.join(['%.3f' % (t,) for t in ts])))
1637 timepath = os.path.join(testdir, '.testtimes')
1641 timepath = os.path.join(testdir, '.testtimes')
1638 try:
1642 try:
1639 os.unlink(timepath)
1643 os.unlink(timepath)
1640 except OSError:
1644 except OSError:
1641 pass
1645 pass
1642 try:
1646 try:
1643 os.rename(tmpname, timepath)
1647 os.rename(tmpname, timepath)
1644 except OSError:
1648 except OSError:
1645 pass
1649 pass
1646
1650
1647 class TextTestRunner(unittest.TextTestRunner):
1651 class TextTestRunner(unittest.TextTestRunner):
1648 """Custom unittest test runner that uses appropriate settings."""
1652 """Custom unittest test runner that uses appropriate settings."""
1649
1653
1650 def __init__(self, runner, *args, **kwargs):
1654 def __init__(self, runner, *args, **kwargs):
1651 super(TextTestRunner, self).__init__(*args, **kwargs)
1655 super(TextTestRunner, self).__init__(*args, **kwargs)
1652
1656
1653 self._runner = runner
1657 self._runner = runner
1654
1658
1655 def run(self, test):
1659 def run(self, test):
1656 result = TestResult(self._runner.options, self.stream,
1660 result = TestResult(self._runner.options, self.stream,
1657 self.descriptions, self.verbosity)
1661 self.descriptions, self.verbosity)
1658
1662
1659 test(result)
1663 test(result)
1660
1664
1661 failed = len(result.failures)
1665 failed = len(result.failures)
1662 warned = len(result.warned)
1666 warned = len(result.warned)
1663 skipped = len(result.skipped)
1667 skipped = len(result.skipped)
1664 ignored = len(result.ignored)
1668 ignored = len(result.ignored)
1665
1669
1666 with iolock:
1670 with iolock:
1667 self.stream.writeln('')
1671 self.stream.writeln('')
1668
1672
1669 if not self._runner.options.noskips:
1673 if not self._runner.options.noskips:
1670 for test, msg in result.skipped:
1674 for test, msg in result.skipped:
1671 self.stream.writeln('Skipped %s: %s' % (test.name, msg))
1675 self.stream.writeln('Skipped %s: %s' % (test.name, msg))
1672 for test, msg in result.warned:
1676 for test, msg in result.warned:
1673 self.stream.writeln('Warned %s: %s' % (test.name, msg))
1677 self.stream.writeln('Warned %s: %s' % (test.name, msg))
1674 for test, msg in result.failures:
1678 for test, msg in result.failures:
1675 self.stream.writeln('Failed %s: %s' % (test.name, msg))
1679 self.stream.writeln('Failed %s: %s' % (test.name, msg))
1676 for test, msg in result.errors:
1680 for test, msg in result.errors:
1677 self.stream.writeln('Errored %s: %s' % (test.name, msg))
1681 self.stream.writeln('Errored %s: %s' % (test.name, msg))
1678
1682
1679 if self._runner.options.xunit:
1683 if self._runner.options.xunit:
1680 xuf = open(self._runner.options.xunit, 'wb')
1684 xuf = open(self._runner.options.xunit, 'wb')
1681 try:
1685 try:
1682 timesd = dict((t[0], t[3]) for t in result.times)
1686 timesd = dict((t[0], t[3]) for t in result.times)
1683 doc = minidom.Document()
1687 doc = minidom.Document()
1684 s = doc.createElement('testsuite')
1688 s = doc.createElement('testsuite')
1685 s.setAttribute('name', 'run-tests')
1689 s.setAttribute('name', 'run-tests')
1686 s.setAttribute('tests', str(result.testsRun))
1690 s.setAttribute('tests', str(result.testsRun))
1687 s.setAttribute('errors', "0") # TODO
1691 s.setAttribute('errors', "0") # TODO
1688 s.setAttribute('failures', str(failed))
1692 s.setAttribute('failures', str(failed))
1689 s.setAttribute('skipped', str(skipped + ignored))
1693 s.setAttribute('skipped', str(skipped + ignored))
1690 doc.appendChild(s)
1694 doc.appendChild(s)
1691 for tc in result.successes:
1695 for tc in result.successes:
1692 t = doc.createElement('testcase')
1696 t = doc.createElement('testcase')
1693 t.setAttribute('name', tc.name)
1697 t.setAttribute('name', tc.name)
1694 t.setAttribute('time', '%.3f' % timesd[tc.name])
1698 t.setAttribute('time', '%.3f' % timesd[tc.name])
1695 s.appendChild(t)
1699 s.appendChild(t)
1696 for tc, err in sorted(result.faildata.items()):
1700 for tc, err in sorted(result.faildata.items()):
1697 t = doc.createElement('testcase')
1701 t = doc.createElement('testcase')
1698 t.setAttribute('name', tc)
1702 t.setAttribute('name', tc)
1699 t.setAttribute('time', '%.3f' % timesd[tc])
1703 t.setAttribute('time', '%.3f' % timesd[tc])
1700 # createCDATASection expects a unicode or it will
1704 # createCDATASection expects a unicode or it will
1701 # convert using default conversion rules, which will
1705 # convert using default conversion rules, which will
1702 # fail if string isn't ASCII.
1706 # fail if string isn't ASCII.
1703 err = cdatasafe(err).decode('utf-8', 'replace')
1707 err = cdatasafe(err).decode('utf-8', 'replace')
1704 cd = doc.createCDATASection(err)
1708 cd = doc.createCDATASection(err)
1705 t.appendChild(cd)
1709 t.appendChild(cd)
1706 s.appendChild(t)
1710 s.appendChild(t)
1707 xuf.write(doc.toprettyxml(indent=' ', encoding='utf-8'))
1711 xuf.write(doc.toprettyxml(indent=' ', encoding='utf-8'))
1708 finally:
1712 finally:
1709 xuf.close()
1713 xuf.close()
1710
1714
1711 if self._runner.options.json:
1715 if self._runner.options.json:
1712 if json is None:
1716 if json is None:
1713 raise ImportError("json module not installed")
1717 raise ImportError("json module not installed")
1714 jsonpath = os.path.join(self._runner._testdir, 'report.json')
1718 jsonpath = os.path.join(self._runner._testdir, 'report.json')
1715 fp = open(jsonpath, 'w')
1719 fp = open(jsonpath, 'w')
1716 try:
1720 try:
1717 timesd = {}
1721 timesd = {}
1718 for tdata in result.times:
1722 for tdata in result.times:
1719 test = tdata[0]
1723 test = tdata[0]
1720 timesd[test] = tdata[1:]
1724 timesd[test] = tdata[1:]
1721
1725
1722 outcome = {}
1726 outcome = {}
1723 groups = [('success', ((tc, None)
1727 groups = [('success', ((tc, None)
1724 for tc in result.successes)),
1728 for tc in result.successes)),
1725 ('failure', result.failures),
1729 ('failure', result.failures),
1726 ('skip', result.skipped)]
1730 ('skip', result.skipped)]
1727 for res, testcases in groups:
1731 for res, testcases in groups:
1728 for tc, __ in testcases:
1732 for tc, __ in testcases:
1729 tres = {'result': res,
1733 tres = {'result': res,
1730 'time': ('%0.3f' % timesd[tc.name][2]),
1734 'time': ('%0.3f' % timesd[tc.name][2]),
1731 'cuser': ('%0.3f' % timesd[tc.name][0]),
1735 'cuser': ('%0.3f' % timesd[tc.name][0]),
1732 'csys': ('%0.3f' % timesd[tc.name][1]),
1736 'csys': ('%0.3f' % timesd[tc.name][1]),
1733 'start': ('%0.3f' % timesd[tc.name][3]),
1737 'start': ('%0.3f' % timesd[tc.name][3]),
1734 'end': ('%0.3f' % timesd[tc.name][4]),
1738 'end': ('%0.3f' % timesd[tc.name][4]),
1735 'diff': result.faildata.get(tc.name, ''),
1739 'diff': result.faildata.get(tc.name, ''),
1736 }
1740 }
1737 outcome[tc.name] = tres
1741 outcome[tc.name] = tres
1738 jsonout = json.dumps(outcome, sort_keys=True, indent=4)
1742 jsonout = json.dumps(outcome, sort_keys=True, indent=4)
1739 fp.writelines(("testreport =", jsonout))
1743 fp.writelines(("testreport =", jsonout))
1740 finally:
1744 finally:
1741 fp.close()
1745 fp.close()
1742
1746
1743 self._runner._checkhglib('Tested')
1747 self._runner._checkhglib('Tested')
1744
1748
1745 savetimes(self._runner._testdir, result)
1749 savetimes(self._runner._testdir, result)
1746 self.stream.writeln(
1750 self.stream.writeln(
1747 '# Ran %d tests, %d skipped, %d warned, %d failed.'
1751 '# Ran %d tests, %d skipped, %d warned, %d failed.'
1748 % (result.testsRun,
1752 % (result.testsRun,
1749 skipped + ignored, warned, failed))
1753 skipped + ignored, warned, failed))
1750 if failed:
1754 if failed:
1751 self.stream.writeln('python hash seed: %s' %
1755 self.stream.writeln('python hash seed: %s' %
1752 os.environ['PYTHONHASHSEED'])
1756 os.environ['PYTHONHASHSEED'])
1753 if self._runner.options.time:
1757 if self._runner.options.time:
1754 self.printtimes(result.times)
1758 self.printtimes(result.times)
1755
1759
1756 return result
1760 return result
1757
1761
1758 def printtimes(self, times):
1762 def printtimes(self, times):
1759 # iolock held by run
1763 # iolock held by run
1760 self.stream.writeln('# Producing time report')
1764 self.stream.writeln('# Producing time report')
1761 times.sort(key=lambda t: (t[3]))
1765 times.sort(key=lambda t: (t[3]))
1762 cols = '%7.3f %7.3f %7.3f %7.3f %7.3f %s'
1766 cols = '%7.3f %7.3f %7.3f %7.3f %7.3f %s'
1763 self.stream.writeln('%-7s %-7s %-7s %-7s %-7s %s' %
1767 self.stream.writeln('%-7s %-7s %-7s %-7s %-7s %s' %
1764 ('start', 'end', 'cuser', 'csys', 'real', 'Test'))
1768 ('start', 'end', 'cuser', 'csys', 'real', 'Test'))
1765 for tdata in times:
1769 for tdata in times:
1766 test = tdata[0]
1770 test = tdata[0]
1767 cuser, csys, real, start, end = tdata[1:6]
1771 cuser, csys, real, start, end = tdata[1:6]
1768 self.stream.writeln(cols % (start, end, cuser, csys, real, test))
1772 self.stream.writeln(cols % (start, end, cuser, csys, real, test))
1769
1773
1770 class TestRunner(object):
1774 class TestRunner(object):
1771 """Holds context for executing tests.
1775 """Holds context for executing tests.
1772
1776
1773 Tests rely on a lot of state. This object holds it for them.
1777 Tests rely on a lot of state. This object holds it for them.
1774 """
1778 """
1775
1779
1776 # Programs required to run tests.
1780 # Programs required to run tests.
1777 REQUIREDTOOLS = [
1781 REQUIREDTOOLS = [
1778 os.path.basename(_bytespath(sys.executable)),
1782 os.path.basename(_bytespath(sys.executable)),
1779 b'diff',
1783 b'diff',
1780 b'grep',
1784 b'grep',
1781 b'unzip',
1785 b'unzip',
1782 b'gunzip',
1786 b'gunzip',
1783 b'bunzip2',
1787 b'bunzip2',
1784 b'sed',
1788 b'sed',
1785 ]
1789 ]
1786
1790
1787 # Maps file extensions to test class.
1791 # Maps file extensions to test class.
1788 TESTTYPES = [
1792 TESTTYPES = [
1789 (b'.py', PythonTest),
1793 (b'.py', PythonTest),
1790 (b'.t', TTest),
1794 (b'.t', TTest),
1791 ]
1795 ]
1792
1796
1793 def __init__(self):
1797 def __init__(self):
1794 self.options = None
1798 self.options = None
1795 self._hgroot = None
1799 self._hgroot = None
1796 self._testdir = None
1800 self._testdir = None
1797 self._hgtmp = None
1801 self._hgtmp = None
1798 self._installdir = None
1802 self._installdir = None
1799 self._bindir = None
1803 self._bindir = None
1800 self._tmpbinddir = None
1804 self._tmpbinddir = None
1801 self._pythondir = None
1805 self._pythondir = None
1802 self._coveragefile = None
1806 self._coveragefile = None
1803 self._createdfiles = []
1807 self._createdfiles = []
1804 self._hgpath = None
1808 self._hgpath = None
1805 self._portoffset = 0
1809 self._portoffset = 0
1806 self._ports = {}
1810 self._ports = {}
1807
1811
1808 def run(self, args, parser=None):
1812 def run(self, args, parser=None):
1809 """Run the test suite."""
1813 """Run the test suite."""
1810 oldmask = os.umask(0o22)
1814 oldmask = os.umask(0o22)
1811 try:
1815 try:
1812 parser = parser or getparser()
1816 parser = parser or getparser()
1813 options, args = parseargs(args, parser)
1817 options, args = parseargs(args, parser)
1814 # positional arguments are paths to test files to run, so
1818 # positional arguments are paths to test files to run, so
1815 # we make sure they're all bytestrings
1819 # we make sure they're all bytestrings
1816 args = [_bytespath(a) for a in args]
1820 args = [_bytespath(a) for a in args]
1817 self.options = options
1821 self.options = options
1818
1822
1819 self._checktools()
1823 self._checktools()
1820 tests = self.findtests(args)
1824 tests = self.findtests(args)
1821 if options.profile_runner:
1825 if options.profile_runner:
1822 import statprof
1826 import statprof
1823 statprof.start()
1827 statprof.start()
1824 result = self._run(tests)
1828 result = self._run(tests)
1825 if options.profile_runner:
1829 if options.profile_runner:
1826 statprof.stop()
1830 statprof.stop()
1827 statprof.display()
1831 statprof.display()
1828 return result
1832 return result
1829
1833
1830 finally:
1834 finally:
1831 os.umask(oldmask)
1835 os.umask(oldmask)
1832
1836
1833 def _run(self, tests):
1837 def _run(self, tests):
1834 if self.options.random:
1838 if self.options.random:
1835 random.shuffle(tests)
1839 random.shuffle(tests)
1836 else:
1840 else:
1837 # keywords for slow tests
1841 # keywords for slow tests
1838 slow = {b'svn': 10,
1842 slow = {b'svn': 10,
1839 b'cvs': 10,
1843 b'cvs': 10,
1840 b'hghave': 10,
1844 b'hghave': 10,
1841 b'largefiles-update': 10,
1845 b'largefiles-update': 10,
1842 b'run-tests': 10,
1846 b'run-tests': 10,
1843 b'corruption': 10,
1847 b'corruption': 10,
1844 b'race': 10,
1848 b'race': 10,
1845 b'i18n': 10,
1849 b'i18n': 10,
1846 b'check': 100,
1850 b'check': 100,
1847 b'gendoc': 100,
1851 b'gendoc': 100,
1848 b'contrib-perf': 200,
1852 b'contrib-perf': 200,
1849 }
1853 }
1850 perf = {}
1854 perf = {}
1851 def sortkey(f):
1855 def sortkey(f):
1852 # run largest tests first, as they tend to take the longest
1856 # run largest tests first, as they tend to take the longest
1853 try:
1857 try:
1854 return perf[f]
1858 return perf[f]
1855 except KeyError:
1859 except KeyError:
1856 try:
1860 try:
1857 val = -os.stat(f).st_size
1861 val = -os.stat(f).st_size
1858 except OSError as e:
1862 except OSError as e:
1859 if e.errno != errno.ENOENT:
1863 if e.errno != errno.ENOENT:
1860 raise
1864 raise
1861 perf[f] = -1e9 # file does not exist, tell early
1865 perf[f] = -1e9 # file does not exist, tell early
1862 return -1e9
1866 return -1e9
1863 for kw, mul in slow.items():
1867 for kw, mul in slow.items():
1864 if kw in f:
1868 if kw in f:
1865 val *= mul
1869 val *= mul
1866 if f.endswith('.py'):
1870 if f.endswith('.py'):
1867 val /= 10.0
1871 val /= 10.0
1868 perf[f] = val / 1000.0
1872 perf[f] = val / 1000.0
1869 return perf[f]
1873 return perf[f]
1870 tests.sort(key=sortkey)
1874 tests.sort(key=sortkey)
1871
1875
1872 self._testdir = osenvironb[b'TESTDIR'] = getattr(
1876 self._testdir = osenvironb[b'TESTDIR'] = getattr(
1873 os, 'getcwdb', os.getcwd)()
1877 os, 'getcwdb', os.getcwd)()
1874
1878
1875 if 'PYTHONHASHSEED' not in os.environ:
1879 if 'PYTHONHASHSEED' not in os.environ:
1876 # use a random python hash seed all the time
1880 # use a random python hash seed all the time
1877 # we do the randomness ourself to know what seed is used
1881 # we do the randomness ourself to know what seed is used
1878 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
1882 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
1879
1883
1880 if self.options.tmpdir:
1884 if self.options.tmpdir:
1881 self.options.keep_tmpdir = True
1885 self.options.keep_tmpdir = True
1882 tmpdir = _bytespath(self.options.tmpdir)
1886 tmpdir = _bytespath(self.options.tmpdir)
1883 if os.path.exists(tmpdir):
1887 if os.path.exists(tmpdir):
1884 # Meaning of tmpdir has changed since 1.3: we used to create
1888 # Meaning of tmpdir has changed since 1.3: we used to create
1885 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
1889 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
1886 # tmpdir already exists.
1890 # tmpdir already exists.
1887 print("error: temp dir %r already exists" % tmpdir)
1891 print("error: temp dir %r already exists" % tmpdir)
1888 return 1
1892 return 1
1889
1893
1890 # Automatically removing tmpdir sounds convenient, but could
1894 # Automatically removing tmpdir sounds convenient, but could
1891 # really annoy anyone in the habit of using "--tmpdir=/tmp"
1895 # really annoy anyone in the habit of using "--tmpdir=/tmp"
1892 # or "--tmpdir=$HOME".
1896 # or "--tmpdir=$HOME".
1893 #vlog("# Removing temp dir", tmpdir)
1897 #vlog("# Removing temp dir", tmpdir)
1894 #shutil.rmtree(tmpdir)
1898 #shutil.rmtree(tmpdir)
1895 os.makedirs(tmpdir)
1899 os.makedirs(tmpdir)
1896 else:
1900 else:
1897 d = None
1901 d = None
1898 if os.name == 'nt':
1902 if os.name == 'nt':
1899 # without this, we get the default temp dir location, but
1903 # without this, we get the default temp dir location, but
1900 # in all lowercase, which causes troubles with paths (issue3490)
1904 # in all lowercase, which causes troubles with paths (issue3490)
1901 d = osenvironb.get(b'TMP', None)
1905 d = osenvironb.get(b'TMP', None)
1902 tmpdir = tempfile.mkdtemp(b'', b'hgtests.', d)
1906 tmpdir = tempfile.mkdtemp(b'', b'hgtests.', d)
1903
1907
1904 self._hgtmp = osenvironb[b'HGTMP'] = (
1908 self._hgtmp = osenvironb[b'HGTMP'] = (
1905 os.path.realpath(tmpdir))
1909 os.path.realpath(tmpdir))
1906
1910
1907 if self.options.with_hg:
1911 if self.options.with_hg:
1908 self._installdir = None
1912 self._installdir = None
1909 whg = self.options.with_hg
1913 whg = self.options.with_hg
1910 # If --with-hg is not specified, we have bytes already,
1914 # If --with-hg is not specified, we have bytes already,
1911 # but if it was specified in python3 we get a str, so we
1915 # but if it was specified in python3 we get a str, so we
1912 # have to encode it back into a bytes.
1916 # have to encode it back into a bytes.
1913 if PYTHON3:
1917 if PYTHON3:
1914 if not isinstance(whg, bytes):
1918 if not isinstance(whg, bytes):
1915 whg = _bytespath(whg)
1919 whg = _bytespath(whg)
1916 self._bindir = os.path.dirname(os.path.realpath(whg))
1920 self._bindir = os.path.dirname(os.path.realpath(whg))
1917 assert isinstance(self._bindir, bytes)
1921 assert isinstance(self._bindir, bytes)
1918 self._tmpbindir = os.path.join(self._hgtmp, b'install', b'bin')
1922 self._tmpbindir = os.path.join(self._hgtmp, b'install', b'bin')
1919 os.makedirs(self._tmpbindir)
1923 os.makedirs(self._tmpbindir)
1920
1924
1921 # This looks redundant with how Python initializes sys.path from
1925 # This looks redundant with how Python initializes sys.path from
1922 # the location of the script being executed. Needed because the
1926 # the location of the script being executed. Needed because the
1923 # "hg" specified by --with-hg is not the only Python script
1927 # "hg" specified by --with-hg is not the only Python script
1924 # executed in the test suite that needs to import 'mercurial'
1928 # executed in the test suite that needs to import 'mercurial'
1925 # ... which means it's not really redundant at all.
1929 # ... which means it's not really redundant at all.
1926 self._pythondir = self._bindir
1930 self._pythondir = self._bindir
1927 else:
1931 else:
1928 self._installdir = os.path.join(self._hgtmp, b"install")
1932 self._installdir = os.path.join(self._hgtmp, b"install")
1929 self._bindir = osenvironb[b"BINDIR"] = \
1933 self._bindir = osenvironb[b"BINDIR"] = \
1930 os.path.join(self._installdir, b"bin")
1934 os.path.join(self._installdir, b"bin")
1931 self._tmpbindir = self._bindir
1935 self._tmpbindir = self._bindir
1932 self._pythondir = os.path.join(self._installdir, b"lib", b"python")
1936 self._pythondir = os.path.join(self._installdir, b"lib", b"python")
1933
1937
1934 osenvironb[b"BINDIR"] = self._bindir
1938 osenvironb[b"BINDIR"] = self._bindir
1935 osenvironb[b"PYTHON"] = PYTHON
1939 osenvironb[b"PYTHON"] = PYTHON
1936
1940
1937 fileb = _bytespath(__file__)
1941 fileb = _bytespath(__file__)
1938 runtestdir = os.path.abspath(os.path.dirname(fileb))
1942 runtestdir = os.path.abspath(os.path.dirname(fileb))
1939 osenvironb[b'RUNTESTDIR'] = runtestdir
1943 osenvironb[b'RUNTESTDIR'] = runtestdir
1940 if PYTHON3:
1944 if PYTHON3:
1941 sepb = _bytespath(os.pathsep)
1945 sepb = _bytespath(os.pathsep)
1942 else:
1946 else:
1943 sepb = os.pathsep
1947 sepb = os.pathsep
1944 path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb)
1948 path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb)
1945 if os.path.islink(__file__):
1949 if os.path.islink(__file__):
1946 # test helper will likely be at the end of the symlink
1950 # test helper will likely be at the end of the symlink
1947 realfile = os.path.realpath(fileb)
1951 realfile = os.path.realpath(fileb)
1948 realdir = os.path.abspath(os.path.dirname(realfile))
1952 realdir = os.path.abspath(os.path.dirname(realfile))
1949 path.insert(2, realdir)
1953 path.insert(2, realdir)
1950 if self._testdir != runtestdir:
1954 if self._testdir != runtestdir:
1951 path = [self._testdir] + path
1955 path = [self._testdir] + path
1952 if self._tmpbindir != self._bindir:
1956 if self._tmpbindir != self._bindir:
1953 path = [self._tmpbindir] + path
1957 path = [self._tmpbindir] + path
1954 osenvironb[b"PATH"] = sepb.join(path)
1958 osenvironb[b"PATH"] = sepb.join(path)
1955
1959
1956 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
1960 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
1957 # can run .../tests/run-tests.py test-foo where test-foo
1961 # can run .../tests/run-tests.py test-foo where test-foo
1958 # adds an extension to HGRC. Also include run-test.py directory to
1962 # adds an extension to HGRC. Also include run-test.py directory to
1959 # import modules like heredoctest.
1963 # import modules like heredoctest.
1960 pypath = [self._pythondir, self._testdir, runtestdir]
1964 pypath = [self._pythondir, self._testdir, runtestdir]
1961 # We have to augment PYTHONPATH, rather than simply replacing
1965 # We have to augment PYTHONPATH, rather than simply replacing
1962 # it, in case external libraries are only available via current
1966 # it, in case external libraries are only available via current
1963 # PYTHONPATH. (In particular, the Subversion bindings on OS X
1967 # PYTHONPATH. (In particular, the Subversion bindings on OS X
1964 # are in /opt/subversion.)
1968 # are in /opt/subversion.)
1965 oldpypath = osenvironb.get(IMPL_PATH)
1969 oldpypath = osenvironb.get(IMPL_PATH)
1966 if oldpypath:
1970 if oldpypath:
1967 pypath.append(oldpypath)
1971 pypath.append(oldpypath)
1968 osenvironb[IMPL_PATH] = sepb.join(pypath)
1972 osenvironb[IMPL_PATH] = sepb.join(pypath)
1969
1973
1970 if self.options.pure:
1974 if self.options.pure:
1971 os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure"
1975 os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure"
1972
1976
1973 if self.options.allow_slow_tests:
1977 if self.options.allow_slow_tests:
1974 os.environ["HGTEST_SLOW"] = "slow"
1978 os.environ["HGTEST_SLOW"] = "slow"
1975 elif 'HGTEST_SLOW' in os.environ:
1979 elif 'HGTEST_SLOW' in os.environ:
1976 del os.environ['HGTEST_SLOW']
1980 del os.environ['HGTEST_SLOW']
1977
1981
1978 self._coveragefile = os.path.join(self._testdir, b'.coverage')
1982 self._coveragefile = os.path.join(self._testdir, b'.coverage')
1979
1983
1980 vlog("# Using TESTDIR", self._testdir)
1984 vlog("# Using TESTDIR", self._testdir)
1981 vlog("# Using RUNTESTDIR", osenvironb[b'RUNTESTDIR'])
1985 vlog("# Using RUNTESTDIR", osenvironb[b'RUNTESTDIR'])
1982 vlog("# Using HGTMP", self._hgtmp)
1986 vlog("# Using HGTMP", self._hgtmp)
1983 vlog("# Using PATH", os.environ["PATH"])
1987 vlog("# Using PATH", os.environ["PATH"])
1984 vlog("# Using", IMPL_PATH, osenvironb[IMPL_PATH])
1988 vlog("# Using", IMPL_PATH, osenvironb[IMPL_PATH])
1985
1989
1986 try:
1990 try:
1987 return self._runtests(tests) or 0
1991 return self._runtests(tests) or 0
1988 finally:
1992 finally:
1989 time.sleep(.1)
1993 time.sleep(.1)
1990 self._cleanup()
1994 self._cleanup()
1991
1995
1992 def findtests(self, args):
1996 def findtests(self, args):
1993 """Finds possible test files from arguments.
1997 """Finds possible test files from arguments.
1994
1998
1995 If you wish to inject custom tests into the test harness, this would
1999 If you wish to inject custom tests into the test harness, this would
1996 be a good function to monkeypatch or override in a derived class.
2000 be a good function to monkeypatch or override in a derived class.
1997 """
2001 """
1998 if not args:
2002 if not args:
1999 if self.options.changed:
2003 if self.options.changed:
2000 proc = Popen4('hg st --rev "%s" -man0 .' %
2004 proc = Popen4('hg st --rev "%s" -man0 .' %
2001 self.options.changed, None, 0)
2005 self.options.changed, None, 0)
2002 stdout, stderr = proc.communicate()
2006 stdout, stderr = proc.communicate()
2003 args = stdout.strip(b'\0').split(b'\0')
2007 args = stdout.strip(b'\0').split(b'\0')
2004 else:
2008 else:
2005 args = os.listdir(b'.')
2009 args = os.listdir(b'.')
2006
2010
2007 return [t for t in args
2011 return [t for t in args
2008 if os.path.basename(t).startswith(b'test-')
2012 if os.path.basename(t).startswith(b'test-')
2009 and (t.endswith(b'.py') or t.endswith(b'.t'))]
2013 and (t.endswith(b'.py') or t.endswith(b'.t'))]
2010
2014
2011 def _runtests(self, tests):
2015 def _runtests(self, tests):
2012 try:
2016 try:
2013 if self._installdir:
2017 if self._installdir:
2014 self._installhg()
2018 self._installhg()
2015 self._checkhglib("Testing")
2019 self._checkhglib("Testing")
2016 else:
2020 else:
2017 self._usecorrectpython()
2021 self._usecorrectpython()
2018
2022
2019 if self.options.restart:
2023 if self.options.restart:
2020 orig = list(tests)
2024 orig = list(tests)
2021 while tests:
2025 while tests:
2022 if os.path.exists(tests[0] + ".err"):
2026 if os.path.exists(tests[0] + ".err"):
2023 break
2027 break
2024 tests.pop(0)
2028 tests.pop(0)
2025 if not tests:
2029 if not tests:
2026 print("running all tests")
2030 print("running all tests")
2027 tests = orig
2031 tests = orig
2028
2032
2029 tests = [self._gettest(t, i) for i, t in enumerate(tests)]
2033 tests = [self._gettest(t, i) for i, t in enumerate(tests)]
2030
2034
2031 failed = False
2035 failed = False
2032 warned = False
2036 warned = False
2033 kws = self.options.keywords
2037 kws = self.options.keywords
2034 if kws is not None and PYTHON3:
2038 if kws is not None and PYTHON3:
2035 kws = kws.encode('utf-8')
2039 kws = kws.encode('utf-8')
2036
2040
2037 suite = TestSuite(self._testdir,
2041 suite = TestSuite(self._testdir,
2038 jobs=self.options.jobs,
2042 jobs=self.options.jobs,
2039 whitelist=self.options.whitelisted,
2043 whitelist=self.options.whitelisted,
2040 blacklist=self.options.blacklist,
2044 blacklist=self.options.blacklist,
2041 retest=self.options.retest,
2045 retest=self.options.retest,
2042 keywords=kws,
2046 keywords=kws,
2043 loop=self.options.loop,
2047 loop=self.options.loop,
2044 runs_per_test=self.options.runs_per_test,
2048 runs_per_test=self.options.runs_per_test,
2045 showchannels=self.options.showchannels,
2049 showchannels=self.options.showchannels,
2046 tests=tests, loadtest=self._gettest)
2050 tests=tests, loadtest=self._gettest)
2047 verbosity = 1
2051 verbosity = 1
2048 if self.options.verbose:
2052 if self.options.verbose:
2049 verbosity = 2
2053 verbosity = 2
2050 runner = TextTestRunner(self, verbosity=verbosity)
2054 runner = TextTestRunner(self, verbosity=verbosity)
2051 result = runner.run(suite)
2055 result = runner.run(suite)
2052
2056
2053 if result.failures:
2057 if result.failures:
2054 failed = True
2058 failed = True
2055 if result.warned:
2059 if result.warned:
2056 warned = True
2060 warned = True
2057
2061
2058 if self.options.anycoverage:
2062 if self.options.anycoverage:
2059 self._outputcoverage()
2063 self._outputcoverage()
2060 except KeyboardInterrupt:
2064 except KeyboardInterrupt:
2061 failed = True
2065 failed = True
2062 print("\ninterrupted!")
2066 print("\ninterrupted!")
2063
2067
2064 if failed:
2068 if failed:
2065 return 1
2069 return 1
2066 if warned:
2070 if warned:
2067 return 80
2071 return 80
2068
2072
2069 def _getport(self, count):
2073 def _getport(self, count):
2070 port = self._ports.get(count) # do we have a cached entry?
2074 port = self._ports.get(count) # do we have a cached entry?
2071 if port is None:
2075 if port is None:
2072 portneeded = 3
2076 portneeded = 3
2073 # above 100 tries we just give up and let test reports failure
2077 # above 100 tries we just give up and let test reports failure
2074 for tries in xrange(100):
2078 for tries in xrange(100):
2075 allfree = True
2079 allfree = True
2076 port = self.options.port + self._portoffset
2080 port = self.options.port + self._portoffset
2077 for idx in xrange(portneeded):
2081 for idx in xrange(portneeded):
2078 if not checkportisavailable(port + idx):
2082 if not checkportisavailable(port + idx):
2079 allfree = False
2083 allfree = False
2080 break
2084 break
2081 self._portoffset += portneeded
2085 self._portoffset += portneeded
2082 if allfree:
2086 if allfree:
2083 break
2087 break
2084 self._ports[count] = port
2088 self._ports[count] = port
2085 return port
2089 return port
2086
2090
2087 def _gettest(self, test, count):
2091 def _gettest(self, test, count):
2088 """Obtain a Test by looking at its filename.
2092 """Obtain a Test by looking at its filename.
2089
2093
2090 Returns a Test instance. The Test may not be runnable if it doesn't
2094 Returns a Test instance. The Test may not be runnable if it doesn't
2091 map to a known type.
2095 map to a known type.
2092 """
2096 """
2093 lctest = test.lower()
2097 lctest = test.lower()
2094 testcls = Test
2098 testcls = Test
2095
2099
2096 for ext, cls in self.TESTTYPES:
2100 for ext, cls in self.TESTTYPES:
2097 if lctest.endswith(ext):
2101 if lctest.endswith(ext):
2098 testcls = cls
2102 testcls = cls
2099 break
2103 break
2100
2104
2101 refpath = os.path.join(self._testdir, test)
2105 refpath = os.path.join(self._testdir, test)
2102 tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
2106 tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
2103
2107
2104 t = testcls(refpath, tmpdir,
2108 t = testcls(refpath, tmpdir,
2105 keeptmpdir=self.options.keep_tmpdir,
2109 keeptmpdir=self.options.keep_tmpdir,
2106 debug=self.options.debug,
2110 debug=self.options.debug,
2107 timeout=self.options.timeout,
2111 timeout=self.options.timeout,
2108 startport=self._getport(count),
2112 startport=self._getport(count),
2109 extraconfigopts=self.options.extra_config_opt,
2113 extraconfigopts=self.options.extra_config_opt,
2110 py3kwarnings=self.options.py3k_warnings,
2114 py3kwarnings=self.options.py3k_warnings,
2111 shell=self.options.shell)
2115 shell=self.options.shell)
2112 t.should_reload = True
2116 t.should_reload = True
2113 return t
2117 return t
2114
2118
2115 def _cleanup(self):
2119 def _cleanup(self):
2116 """Clean up state from this test invocation."""
2120 """Clean up state from this test invocation."""
2117
2121
2118 if self.options.keep_tmpdir:
2122 if self.options.keep_tmpdir:
2119 return
2123 return
2120
2124
2121 vlog("# Cleaning up HGTMP", self._hgtmp)
2125 vlog("# Cleaning up HGTMP", self._hgtmp)
2122 shutil.rmtree(self._hgtmp, True)
2126 shutil.rmtree(self._hgtmp, True)
2123 for f in self._createdfiles:
2127 for f in self._createdfiles:
2124 try:
2128 try:
2125 os.remove(f)
2129 os.remove(f)
2126 except OSError:
2130 except OSError:
2127 pass
2131 pass
2128
2132
2129 def _usecorrectpython(self):
2133 def _usecorrectpython(self):
2130 """Configure the environment to use the appropriate Python in tests."""
2134 """Configure the environment to use the appropriate Python in tests."""
2131 # Tests must use the same interpreter as us or bad things will happen.
2135 # Tests must use the same interpreter as us or bad things will happen.
2132 pyexename = sys.platform == 'win32' and b'python.exe' or b'python'
2136 pyexename = sys.platform == 'win32' and b'python.exe' or b'python'
2133 if getattr(os, 'symlink', None):
2137 if getattr(os, 'symlink', None):
2134 vlog("# Making python executable in test path a symlink to '%s'" %
2138 vlog("# Making python executable in test path a symlink to '%s'" %
2135 sys.executable)
2139 sys.executable)
2136 mypython = os.path.join(self._tmpbindir, pyexename)
2140 mypython = os.path.join(self._tmpbindir, pyexename)
2137 try:
2141 try:
2138 if os.readlink(mypython) == sys.executable:
2142 if os.readlink(mypython) == sys.executable:
2139 return
2143 return
2140 os.unlink(mypython)
2144 os.unlink(mypython)
2141 except OSError as err:
2145 except OSError as err:
2142 if err.errno != errno.ENOENT:
2146 if err.errno != errno.ENOENT:
2143 raise
2147 raise
2144 if self._findprogram(pyexename) != sys.executable:
2148 if self._findprogram(pyexename) != sys.executable:
2145 try:
2149 try:
2146 os.symlink(sys.executable, mypython)
2150 os.symlink(sys.executable, mypython)
2147 self._createdfiles.append(mypython)
2151 self._createdfiles.append(mypython)
2148 except OSError as err:
2152 except OSError as err:
2149 # child processes may race, which is harmless
2153 # child processes may race, which is harmless
2150 if err.errno != errno.EEXIST:
2154 if err.errno != errno.EEXIST:
2151 raise
2155 raise
2152 else:
2156 else:
2153 exedir, exename = os.path.split(sys.executable)
2157 exedir, exename = os.path.split(sys.executable)
2154 vlog("# Modifying search path to find %s as %s in '%s'" %
2158 vlog("# Modifying search path to find %s as %s in '%s'" %
2155 (exename, pyexename, exedir))
2159 (exename, pyexename, exedir))
2156 path = os.environ['PATH'].split(os.pathsep)
2160 path = os.environ['PATH'].split(os.pathsep)
2157 while exedir in path:
2161 while exedir in path:
2158 path.remove(exedir)
2162 path.remove(exedir)
2159 os.environ['PATH'] = os.pathsep.join([exedir] + path)
2163 os.environ['PATH'] = os.pathsep.join([exedir] + path)
2160 if not self._findprogram(pyexename):
2164 if not self._findprogram(pyexename):
2161 print("WARNING: Cannot find %s in search path" % pyexename)
2165 print("WARNING: Cannot find %s in search path" % pyexename)
2162
2166
2163 def _installhg(self):
2167 def _installhg(self):
2164 """Install hg into the test environment.
2168 """Install hg into the test environment.
2165
2169
2166 This will also configure hg with the appropriate testing settings.
2170 This will also configure hg with the appropriate testing settings.
2167 """
2171 """
2168 vlog("# Performing temporary installation of HG")
2172 vlog("# Performing temporary installation of HG")
2169 installerrs = os.path.join(b"tests", b"install.err")
2173 installerrs = os.path.join(b"tests", b"install.err")
2170 compiler = ''
2174 compiler = ''
2171 if self.options.compiler:
2175 if self.options.compiler:
2172 compiler = '--compiler ' + self.options.compiler
2176 compiler = '--compiler ' + self.options.compiler
2173 if self.options.pure:
2177 if self.options.pure:
2174 pure = b"--pure"
2178 pure = b"--pure"
2175 else:
2179 else:
2176 pure = b""
2180 pure = b""
2177 py3 = ''
2181 py3 = ''
2178
2182
2179 # Run installer in hg root
2183 # Run installer in hg root
2180 script = os.path.realpath(sys.argv[0])
2184 script = os.path.realpath(sys.argv[0])
2181 exe = sys.executable
2185 exe = sys.executable
2182 if PYTHON3:
2186 if PYTHON3:
2183 py3 = b'--c2to3'
2187 py3 = b'--c2to3'
2184 compiler = _bytespath(compiler)
2188 compiler = _bytespath(compiler)
2185 script = _bytespath(script)
2189 script = _bytespath(script)
2186 exe = _bytespath(exe)
2190 exe = _bytespath(exe)
2187 hgroot = os.path.dirname(os.path.dirname(script))
2191 hgroot = os.path.dirname(os.path.dirname(script))
2188 self._hgroot = hgroot
2192 self._hgroot = hgroot
2189 os.chdir(hgroot)
2193 os.chdir(hgroot)
2190 nohome = b'--home=""'
2194 nohome = b'--home=""'
2191 if os.name == 'nt':
2195 if os.name == 'nt':
2192 # The --home="" trick works only on OS where os.sep == '/'
2196 # The --home="" trick works only on OS where os.sep == '/'
2193 # because of a distutils convert_path() fast-path. Avoid it at
2197 # because of a distutils convert_path() fast-path. Avoid it at
2194 # least on Windows for now, deal with .pydistutils.cfg bugs
2198 # least on Windows for now, deal with .pydistutils.cfg bugs
2195 # when they happen.
2199 # when they happen.
2196 nohome = b''
2200 nohome = b''
2197 cmd = (b'%(exe)s setup.py %(py3)s %(pure)s clean --all'
2201 cmd = (b'%(exe)s setup.py %(py3)s %(pure)s clean --all'
2198 b' build %(compiler)s --build-base="%(base)s"'
2202 b' build %(compiler)s --build-base="%(base)s"'
2199 b' install --force --prefix="%(prefix)s"'
2203 b' install --force --prefix="%(prefix)s"'
2200 b' --install-lib="%(libdir)s"'
2204 b' --install-lib="%(libdir)s"'
2201 b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
2205 b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
2202 % {b'exe': exe, b'py3': py3, b'pure': pure,
2206 % {b'exe': exe, b'py3': py3, b'pure': pure,
2203 b'compiler': compiler,
2207 b'compiler': compiler,
2204 b'base': os.path.join(self._hgtmp, b"build"),
2208 b'base': os.path.join(self._hgtmp, b"build"),
2205 b'prefix': self._installdir, b'libdir': self._pythondir,
2209 b'prefix': self._installdir, b'libdir': self._pythondir,
2206 b'bindir': self._bindir,
2210 b'bindir': self._bindir,
2207 b'nohome': nohome, b'logfile': installerrs})
2211 b'nohome': nohome, b'logfile': installerrs})
2208
2212
2209 # setuptools requires install directories to exist.
2213 # setuptools requires install directories to exist.
2210 def makedirs(p):
2214 def makedirs(p):
2211 try:
2215 try:
2212 os.makedirs(p)
2216 os.makedirs(p)
2213 except OSError as e:
2217 except OSError as e:
2214 if e.errno != errno.EEXIST:
2218 if e.errno != errno.EEXIST:
2215 raise
2219 raise
2216 makedirs(self._pythondir)
2220 makedirs(self._pythondir)
2217 makedirs(self._bindir)
2221 makedirs(self._bindir)
2218
2222
2219 vlog("# Running", cmd)
2223 vlog("# Running", cmd)
2220 if os.system(cmd) == 0:
2224 if os.system(cmd) == 0:
2221 if not self.options.verbose:
2225 if not self.options.verbose:
2222 try:
2226 try:
2223 os.remove(installerrs)
2227 os.remove(installerrs)
2224 except OSError as e:
2228 except OSError as e:
2225 if e.errno != errno.ENOENT:
2229 if e.errno != errno.ENOENT:
2226 raise
2230 raise
2227 else:
2231 else:
2228 f = open(installerrs, 'rb')
2232 f = open(installerrs, 'rb')
2229 for line in f:
2233 for line in f:
2230 if PYTHON3:
2234 if PYTHON3:
2231 sys.stdout.buffer.write(line)
2235 sys.stdout.buffer.write(line)
2232 else:
2236 else:
2233 sys.stdout.write(line)
2237 sys.stdout.write(line)
2234 f.close()
2238 f.close()
2235 sys.exit(1)
2239 sys.exit(1)
2236 os.chdir(self._testdir)
2240 os.chdir(self._testdir)
2237
2241
2238 self._usecorrectpython()
2242 self._usecorrectpython()
2239
2243
2240 if self.options.py3k_warnings and not self.options.anycoverage:
2244 if self.options.py3k_warnings and not self.options.anycoverage:
2241 vlog("# Updating hg command to enable Py3k Warnings switch")
2245 vlog("# Updating hg command to enable Py3k Warnings switch")
2242 f = open(os.path.join(self._bindir, 'hg'), 'rb')
2246 f = open(os.path.join(self._bindir, 'hg'), 'rb')
2243 lines = [line.rstrip() for line in f]
2247 lines = [line.rstrip() for line in f]
2244 lines[0] += ' -3'
2248 lines[0] += ' -3'
2245 f.close()
2249 f.close()
2246 f = open(os.path.join(self._bindir, 'hg'), 'wb')
2250 f = open(os.path.join(self._bindir, 'hg'), 'wb')
2247 for line in lines:
2251 for line in lines:
2248 f.write(line + '\n')
2252 f.write(line + '\n')
2249 f.close()
2253 f.close()
2250
2254
2251 hgbat = os.path.join(self._bindir, b'hg.bat')
2255 hgbat = os.path.join(self._bindir, b'hg.bat')
2252 if os.path.isfile(hgbat):
2256 if os.path.isfile(hgbat):
2253 # hg.bat expects to be put in bin/scripts while run-tests.py
2257 # hg.bat expects to be put in bin/scripts while run-tests.py
2254 # installation layout put it in bin/ directly. Fix it
2258 # installation layout put it in bin/ directly. Fix it
2255 f = open(hgbat, 'rb')
2259 f = open(hgbat, 'rb')
2256 data = f.read()
2260 data = f.read()
2257 f.close()
2261 f.close()
2258 if b'"%~dp0..\python" "%~dp0hg" %*' in data:
2262 if b'"%~dp0..\python" "%~dp0hg" %*' in data:
2259 data = data.replace(b'"%~dp0..\python" "%~dp0hg" %*',
2263 data = data.replace(b'"%~dp0..\python" "%~dp0hg" %*',
2260 b'"%~dp0python" "%~dp0hg" %*')
2264 b'"%~dp0python" "%~dp0hg" %*')
2261 f = open(hgbat, 'wb')
2265 f = open(hgbat, 'wb')
2262 f.write(data)
2266 f.write(data)
2263 f.close()
2267 f.close()
2264 else:
2268 else:
2265 print('WARNING: cannot fix hg.bat reference to python.exe')
2269 print('WARNING: cannot fix hg.bat reference to python.exe')
2266
2270
2267 if self.options.anycoverage:
2271 if self.options.anycoverage:
2268 custom = os.path.join(self._testdir, 'sitecustomize.py')
2272 custom = os.path.join(self._testdir, 'sitecustomize.py')
2269 target = os.path.join(self._pythondir, 'sitecustomize.py')
2273 target = os.path.join(self._pythondir, 'sitecustomize.py')
2270 vlog('# Installing coverage trigger to %s' % target)
2274 vlog('# Installing coverage trigger to %s' % target)
2271 shutil.copyfile(custom, target)
2275 shutil.copyfile(custom, target)
2272 rc = os.path.join(self._testdir, '.coveragerc')
2276 rc = os.path.join(self._testdir, '.coveragerc')
2273 vlog('# Installing coverage rc to %s' % rc)
2277 vlog('# Installing coverage rc to %s' % rc)
2274 os.environ['COVERAGE_PROCESS_START'] = rc
2278 os.environ['COVERAGE_PROCESS_START'] = rc
2275 covdir = os.path.join(self._installdir, '..', 'coverage')
2279 covdir = os.path.join(self._installdir, '..', 'coverage')
2276 try:
2280 try:
2277 os.mkdir(covdir)
2281 os.mkdir(covdir)
2278 except OSError as e:
2282 except OSError as e:
2279 if e.errno != errno.EEXIST:
2283 if e.errno != errno.EEXIST:
2280 raise
2284 raise
2281
2285
2282 os.environ['COVERAGE_DIR'] = covdir
2286 os.environ['COVERAGE_DIR'] = covdir
2283
2287
2284 def _checkhglib(self, verb):
2288 def _checkhglib(self, verb):
2285 """Ensure that the 'mercurial' package imported by python is
2289 """Ensure that the 'mercurial' package imported by python is
2286 the one we expect it to be. If not, print a warning to stderr."""
2290 the one we expect it to be. If not, print a warning to stderr."""
2287 if ((self._bindir == self._pythondir) and
2291 if ((self._bindir == self._pythondir) and
2288 (self._bindir != self._tmpbindir)):
2292 (self._bindir != self._tmpbindir)):
2289 # The pythondir has been inferred from --with-hg flag.
2293 # The pythondir has been inferred from --with-hg flag.
2290 # We cannot expect anything sensible here.
2294 # We cannot expect anything sensible here.
2291 return
2295 return
2292 expecthg = os.path.join(self._pythondir, b'mercurial')
2296 expecthg = os.path.join(self._pythondir, b'mercurial')
2293 actualhg = self._gethgpath()
2297 actualhg = self._gethgpath()
2294 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
2298 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
2295 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
2299 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
2296 ' (expected %s)\n'
2300 ' (expected %s)\n'
2297 % (verb, actualhg, expecthg))
2301 % (verb, actualhg, expecthg))
2298 def _gethgpath(self):
2302 def _gethgpath(self):
2299 """Return the path to the mercurial package that is actually found by
2303 """Return the path to the mercurial package that is actually found by
2300 the current Python interpreter."""
2304 the current Python interpreter."""
2301 if self._hgpath is not None:
2305 if self._hgpath is not None:
2302 return self._hgpath
2306 return self._hgpath
2303
2307
2304 cmd = b'%s -c "import mercurial; print (mercurial.__path__[0])"'
2308 cmd = b'%s -c "import mercurial; print (mercurial.__path__[0])"'
2305 cmd = cmd % PYTHON
2309 cmd = cmd % PYTHON
2306 if PYTHON3:
2310 if PYTHON3:
2307 cmd = _strpath(cmd)
2311 cmd = _strpath(cmd)
2308 pipe = os.popen(cmd)
2312 pipe = os.popen(cmd)
2309 try:
2313 try:
2310 self._hgpath = _bytespath(pipe.read().strip())
2314 self._hgpath = _bytespath(pipe.read().strip())
2311 finally:
2315 finally:
2312 pipe.close()
2316 pipe.close()
2313
2317
2314 return self._hgpath
2318 return self._hgpath
2315
2319
2316 def _outputcoverage(self):
2320 def _outputcoverage(self):
2317 """Produce code coverage output."""
2321 """Produce code coverage output."""
2318 from coverage import coverage
2322 from coverage import coverage
2319
2323
2320 vlog('# Producing coverage report')
2324 vlog('# Producing coverage report')
2321 # chdir is the easiest way to get short, relative paths in the
2325 # chdir is the easiest way to get short, relative paths in the
2322 # output.
2326 # output.
2323 os.chdir(self._hgroot)
2327 os.chdir(self._hgroot)
2324 covdir = os.path.join(self._installdir, '..', 'coverage')
2328 covdir = os.path.join(self._installdir, '..', 'coverage')
2325 cov = coverage(data_file=os.path.join(covdir, 'cov'))
2329 cov = coverage(data_file=os.path.join(covdir, 'cov'))
2326
2330
2327 # Map install directory paths back to source directory.
2331 # Map install directory paths back to source directory.
2328 cov.config.paths['srcdir'] = ['.', self._pythondir]
2332 cov.config.paths['srcdir'] = ['.', self._pythondir]
2329
2333
2330 cov.combine()
2334 cov.combine()
2331
2335
2332 omit = [os.path.join(x, '*') for x in [self._bindir, self._testdir]]
2336 omit = [os.path.join(x, '*') for x in [self._bindir, self._testdir]]
2333 cov.report(ignore_errors=True, omit=omit)
2337 cov.report(ignore_errors=True, omit=omit)
2334
2338
2335 if self.options.htmlcov:
2339 if self.options.htmlcov:
2336 htmldir = os.path.join(self._testdir, 'htmlcov')
2340 htmldir = os.path.join(self._testdir, 'htmlcov')
2337 cov.html_report(directory=htmldir, omit=omit)
2341 cov.html_report(directory=htmldir, omit=omit)
2338 if self.options.annotate:
2342 if self.options.annotate:
2339 adir = os.path.join(self._testdir, 'annotated')
2343 adir = os.path.join(self._testdir, 'annotated')
2340 if not os.path.isdir(adir):
2344 if not os.path.isdir(adir):
2341 os.mkdir(adir)
2345 os.mkdir(adir)
2342 cov.annotate(directory=adir, omit=omit)
2346 cov.annotate(directory=adir, omit=omit)
2343
2347
2344 def _findprogram(self, program):
2348 def _findprogram(self, program):
2345 """Search PATH for a executable program"""
2349 """Search PATH for a executable program"""
2346 dpb = _bytespath(os.defpath)
2350 dpb = _bytespath(os.defpath)
2347 sepb = _bytespath(os.pathsep)
2351 sepb = _bytespath(os.pathsep)
2348 for p in osenvironb.get(b'PATH', dpb).split(sepb):
2352 for p in osenvironb.get(b'PATH', dpb).split(sepb):
2349 name = os.path.join(p, program)
2353 name = os.path.join(p, program)
2350 if os.name == 'nt' or os.access(name, os.X_OK):
2354 if os.name == 'nt' or os.access(name, os.X_OK):
2351 return name
2355 return name
2352 return None
2356 return None
2353
2357
2354 def _checktools(self):
2358 def _checktools(self):
2355 """Ensure tools required to run tests are present."""
2359 """Ensure tools required to run tests are present."""
2356 for p in self.REQUIREDTOOLS:
2360 for p in self.REQUIREDTOOLS:
2357 if os.name == 'nt' and not p.endswith('.exe'):
2361 if os.name == 'nt' and not p.endswith('.exe'):
2358 p += '.exe'
2362 p += '.exe'
2359 found = self._findprogram(p)
2363 found = self._findprogram(p)
2360 if found:
2364 if found:
2361 vlog("# Found prerequisite", p, "at", found)
2365 vlog("# Found prerequisite", p, "at", found)
2362 else:
2366 else:
2363 print("WARNING: Did not find prerequisite tool: %s " % p)
2367 print("WARNING: Did not find prerequisite tool: %s " % p)
2364
2368
2365 if __name__ == '__main__':
2369 if __name__ == '__main__':
2366 runner = TestRunner()
2370 runner = TestRunner()
2367
2371
2368 try:
2372 try:
2369 import msvcrt
2373 import msvcrt
2370 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
2374 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
2371 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
2375 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
2372 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
2376 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
2373 except ImportError:
2377 except ImportError:
2374 pass
2378 pass
2375
2379
2376 sys.exit(runner.run(sys.argv[1:]))
2380 sys.exit(runner.run(sys.argv[1:]))
General Comments 0
You need to be logged in to leave comments. Login now