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