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