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