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