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