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