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