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