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