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