##// END OF EJS Templates
tests: accept \-escaped test output...
Yuya Nishihara -
r12721:d4e21a9d default
parent child Browse files
Show More
@@ -1,1090 +1,1092 b''
1 1 #!/usr/bin/env python
2 2 #
3 3 # run-tests.py - Run a set of tests on Mercurial
4 4 #
5 5 # Copyright 2006 Matt Mackall <mpm@selenic.com>
6 6 #
7 7 # This software may be used and distributed according to the terms of the
8 8 # GNU General Public License version 2 or any later version.
9 9
10 10 # Modifying this script is tricky because it has many modes:
11 11 # - serial (default) vs parallel (-jN, N > 1)
12 12 # - no coverage (default) vs coverage (-c, -C, -s)
13 13 # - temp install (default) vs specific hg script (--with-hg, --local)
14 14 # - tests are a mix of shell scripts and Python scripts
15 15 #
16 16 # If you change this script, it is recommended that you ensure you
17 17 # haven't broken it by running it in various modes with a representative
18 18 # sample of test scripts. For example:
19 19 #
20 20 # 1) serial, no coverage, temp install:
21 21 # ./run-tests.py test-s*
22 22 # 2) serial, no coverage, local hg:
23 23 # ./run-tests.py --local test-s*
24 24 # 3) serial, coverage, temp install:
25 25 # ./run-tests.py -c test-s*
26 26 # 4) serial, coverage, local hg:
27 27 # ./run-tests.py -c --local test-s* # unsupported
28 28 # 5) parallel, no coverage, temp install:
29 29 # ./run-tests.py -j2 test-s*
30 30 # 6) parallel, no coverage, local hg:
31 31 # ./run-tests.py -j2 --local test-s*
32 32 # 7) parallel, coverage, temp install:
33 33 # ./run-tests.py -j2 -c test-s* # currently broken
34 34 # 8) parallel, coverage, local install:
35 35 # ./run-tests.py -j2 -c --local test-s* # unsupported (and broken)
36 36 # 9) parallel, custom tmp dir:
37 37 # ./run-tests.py -j2 --tmpdir /tmp/myhgtests
38 38 #
39 39 # (You could use any subset of the tests: test-s* happens to match
40 40 # enough that it's worth doing parallel runs, few enough that it
41 41 # completes fairly quickly, includes both shell and Python scripts, and
42 42 # includes some scripts that run daemon processes.)
43 43
44 44 from distutils import version
45 45 import difflib
46 46 import errno
47 47 import optparse
48 48 import os
49 49 import shutil
50 50 import subprocess
51 51 import signal
52 52 import sys
53 53 import tempfile
54 54 import time
55 55 import re
56 56
57 57 closefds = os.name == 'posix'
58 58 def Popen4(cmd, bufsize=-1):
59 59 p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
60 60 close_fds=closefds,
61 61 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
62 62 stderr=subprocess.STDOUT)
63 63 p.fromchild = p.stdout
64 64 p.tochild = p.stdin
65 65 p.childerr = p.stderr
66 66 return p
67 67
68 68 # reserved exit code to skip test (used by hghave)
69 69 SKIPPED_STATUS = 80
70 70 SKIPPED_PREFIX = 'skipped: '
71 71 FAILED_PREFIX = 'hghave check failed: '
72 72 PYTHON = sys.executable
73 73 IMPL_PATH = 'PYTHONPATH'
74 74 if 'java' in sys.platform:
75 75 IMPL_PATH = 'JYTHONPATH'
76 76
77 77 requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
78 78
79 79 defaults = {
80 80 'jobs': ('HGTEST_JOBS', 1),
81 81 'timeout': ('HGTEST_TIMEOUT', 180),
82 82 'port': ('HGTEST_PORT', 20059),
83 83 }
84 84
85 85 def parseargs():
86 86 parser = optparse.OptionParser("%prog [options] [tests]")
87 87
88 88 # keep these sorted
89 89 parser.add_option("--blacklist", action="append",
90 90 help="skip tests listed in the specified blacklist file")
91 91 parser.add_option("-C", "--annotate", action="store_true",
92 92 help="output files annotated with coverage")
93 93 parser.add_option("--child", type="int",
94 94 help="run as child process, summary to given fd")
95 95 parser.add_option("-c", "--cover", action="store_true",
96 96 help="print a test coverage report")
97 97 parser.add_option("-d", "--debug", action="store_true",
98 98 help="debug mode: write output of test scripts to console"
99 99 " rather than capturing and diff'ing it (disables timeout)")
100 100 parser.add_option("-f", "--first", action="store_true",
101 101 help="exit on the first test failure")
102 102 parser.add_option("--inotify", action="store_true",
103 103 help="enable inotify extension when running tests")
104 104 parser.add_option("-i", "--interactive", action="store_true",
105 105 help="prompt to accept changed output")
106 106 parser.add_option("-j", "--jobs", type="int",
107 107 help="number of jobs to run in parallel"
108 108 " (default: $%s or %d)" % defaults['jobs'])
109 109 parser.add_option("--keep-tmpdir", action="store_true",
110 110 help="keep temporary directory after running tests")
111 111 parser.add_option("-k", "--keywords",
112 112 help="run tests matching keywords")
113 113 parser.add_option("-l", "--local", action="store_true",
114 114 help="shortcut for --with-hg=<testdir>/../hg")
115 115 parser.add_option("-n", "--nodiff", action="store_true",
116 116 help="skip showing test changes")
117 117 parser.add_option("-p", "--port", type="int",
118 118 help="port on which servers should listen"
119 119 " (default: $%s or %d)" % defaults['port'])
120 120 parser.add_option("--pure", action="store_true",
121 121 help="use pure Python code instead of C extensions")
122 122 parser.add_option("-R", "--restart", action="store_true",
123 123 help="restart at last error")
124 124 parser.add_option("-r", "--retest", action="store_true",
125 125 help="retest failed tests")
126 126 parser.add_option("-S", "--noskips", action="store_true",
127 127 help="don't report skip tests verbosely")
128 128 parser.add_option("-t", "--timeout", type="int",
129 129 help="kill errant tests after TIMEOUT seconds"
130 130 " (default: $%s or %d)" % defaults['timeout'])
131 131 parser.add_option("--tmpdir", type="string",
132 132 help="run tests in the given temporary directory"
133 133 " (implies --keep-tmpdir)")
134 134 parser.add_option("-v", "--verbose", action="store_true",
135 135 help="output verbose messages")
136 136 parser.add_option("--view", type="string",
137 137 help="external diff viewer")
138 138 parser.add_option("--with-hg", type="string",
139 139 metavar="HG",
140 140 help="test using specified hg script rather than a "
141 141 "temporary installation")
142 142 parser.add_option("-3", "--py3k-warnings", action="store_true",
143 143 help="enable Py3k warnings on Python 2.6+")
144 144
145 145 for option, default in defaults.items():
146 146 defaults[option] = int(os.environ.get(*default))
147 147 parser.set_defaults(**defaults)
148 148 (options, args) = parser.parse_args()
149 149
150 150 # jython is always pure
151 151 if 'java' in sys.platform or '__pypy__' in sys.modules:
152 152 options.pure = True
153 153
154 154 if options.with_hg:
155 155 if not (os.path.isfile(options.with_hg) and
156 156 os.access(options.with_hg, os.X_OK)):
157 157 parser.error('--with-hg must specify an executable hg script')
158 158 if not os.path.basename(options.with_hg) == 'hg':
159 159 sys.stderr.write('warning: --with-hg should specify an hg script')
160 160 if options.local:
161 161 testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
162 162 hgbin = os.path.join(os.path.dirname(testdir), 'hg')
163 163 if not os.access(hgbin, os.X_OK):
164 164 parser.error('--local specified, but %r not found or not executable'
165 165 % hgbin)
166 166 options.with_hg = hgbin
167 167
168 168 options.anycoverage = options.cover or options.annotate
169 169 if options.anycoverage:
170 170 try:
171 171 import coverage
172 172 covver = version.StrictVersion(coverage.__version__).version
173 173 if covver < (3, 3):
174 174 parser.error('coverage options require coverage 3.3 or later')
175 175 except ImportError:
176 176 parser.error('coverage options now require the coverage package')
177 177
178 178 if options.anycoverage and options.local:
179 179 # this needs some path mangling somewhere, I guess
180 180 parser.error("sorry, coverage options do not work when --local "
181 181 "is specified")
182 182
183 183 global vlog
184 184 if options.verbose:
185 185 if options.jobs > 1 or options.child is not None:
186 186 pid = "[%d]" % os.getpid()
187 187 else:
188 188 pid = None
189 189 def vlog(*msg):
190 190 if pid:
191 191 print pid,
192 192 for m in msg:
193 193 print m,
194 194 print
195 195 sys.stdout.flush()
196 196 else:
197 197 vlog = lambda *msg: None
198 198
199 199 if options.tmpdir:
200 200 options.tmpdir = os.path.expanduser(options.tmpdir)
201 201
202 202 if options.jobs < 1:
203 203 parser.error('--jobs must be positive')
204 204 if options.interactive and options.jobs > 1:
205 205 print '(--interactive overrides --jobs)'
206 206 options.jobs = 1
207 207 if options.interactive and options.debug:
208 208 parser.error("-i/--interactive and -d/--debug are incompatible")
209 209 if options.debug:
210 210 if options.timeout != defaults['timeout']:
211 211 sys.stderr.write(
212 212 'warning: --timeout option ignored with --debug\n')
213 213 options.timeout = 0
214 214 if options.py3k_warnings:
215 215 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
216 216 parser.error('--py3k-warnings can only be used on Python 2.6+')
217 217 if options.blacklist:
218 218 blacklist = dict()
219 219 for filename in options.blacklist:
220 220 try:
221 221 path = os.path.expanduser(os.path.expandvars(filename))
222 222 f = open(path, "r")
223 223 except IOError, err:
224 224 if err.errno != errno.ENOENT:
225 225 raise
226 226 print "warning: no such blacklist file: %s" % filename
227 227 continue
228 228
229 229 for line in f.readlines():
230 230 line = line.strip()
231 231 if line and not line.startswith('#'):
232 232 blacklist[line] = filename
233 233
234 234 options.blacklist = blacklist
235 235
236 236 return (options, args)
237 237
238 238 def rename(src, dst):
239 239 """Like os.rename(), trade atomicity and opened files friendliness
240 240 for existing destination support.
241 241 """
242 242 shutil.copy(src, dst)
243 243 os.remove(src)
244 244
245 245 def splitnewlines(text):
246 246 '''like str.splitlines, but only split on newlines.
247 247 keep line endings.'''
248 248 i = 0
249 249 lines = []
250 250 while True:
251 251 n = text.find('\n', i)
252 252 if n == -1:
253 253 last = text[i:]
254 254 if last:
255 255 lines.append(last)
256 256 return lines
257 257 lines.append(text[i:n + 1])
258 258 i = n + 1
259 259
260 260 def parsehghaveoutput(lines):
261 261 '''Parse hghave log lines.
262 262 Return tuple of lists (missing, failed):
263 263 * the missing/unknown features
264 264 * the features for which existence check failed'''
265 265 missing = []
266 266 failed = []
267 267 for line in lines:
268 268 if line.startswith(SKIPPED_PREFIX):
269 269 line = line.splitlines()[0]
270 270 missing.append(line[len(SKIPPED_PREFIX):])
271 271 elif line.startswith(FAILED_PREFIX):
272 272 line = line.splitlines()[0]
273 273 failed.append(line[len(FAILED_PREFIX):])
274 274
275 275 return missing, failed
276 276
277 277 def showdiff(expected, output, ref, err):
278 278 for line in difflib.unified_diff(expected, output, ref, err):
279 279 sys.stdout.write(line)
280 280
281 281 def findprogram(program):
282 282 """Search PATH for a executable program"""
283 283 for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
284 284 name = os.path.join(p, program)
285 285 if os.access(name, os.X_OK):
286 286 return name
287 287 return None
288 288
289 289 def checktools():
290 290 # Before we go any further, check for pre-requisite tools
291 291 # stuff from coreutils (cat, rm, etc) are not tested
292 292 for p in requiredtools:
293 293 if os.name == 'nt':
294 294 p += '.exe'
295 295 found = findprogram(p)
296 296 if found:
297 297 vlog("# Found prerequisite", p, "at", found)
298 298 else:
299 299 print "WARNING: Did not find prerequisite tool: "+p
300 300
301 301 def killdaemons():
302 302 # Kill off any leftover daemon processes
303 303 try:
304 304 fp = open(DAEMON_PIDS)
305 305 for line in fp:
306 306 try:
307 307 pid = int(line)
308 308 except ValueError:
309 309 continue
310 310 try:
311 311 os.kill(pid, 0)
312 312 vlog('# Killing daemon process %d' % pid)
313 313 os.kill(pid, signal.SIGTERM)
314 314 time.sleep(0.25)
315 315 os.kill(pid, 0)
316 316 vlog('# Daemon process %d is stuck - really killing it' % pid)
317 317 os.kill(pid, signal.SIGKILL)
318 318 except OSError, err:
319 319 if err.errno != errno.ESRCH:
320 320 raise
321 321 fp.close()
322 322 os.unlink(DAEMON_PIDS)
323 323 except IOError:
324 324 pass
325 325
326 326 def cleanup(options):
327 327 if not options.keep_tmpdir:
328 328 vlog("# Cleaning up HGTMP", HGTMP)
329 329 shutil.rmtree(HGTMP, True)
330 330
331 331 def usecorrectpython():
332 332 # some tests run python interpreter. they must use same
333 333 # interpreter we use or bad things will happen.
334 334 exedir, exename = os.path.split(sys.executable)
335 335 if exename == 'python':
336 336 path = findprogram('python')
337 337 if os.path.dirname(path) == exedir:
338 338 return
339 339 vlog('# Making python executable in test path use correct Python')
340 340 mypython = os.path.join(BINDIR, 'python')
341 341 try:
342 342 os.symlink(sys.executable, mypython)
343 343 except AttributeError:
344 344 # windows fallback
345 345 shutil.copyfile(sys.executable, mypython)
346 346 shutil.copymode(sys.executable, mypython)
347 347
348 348 def installhg(options):
349 349 vlog("# Performing temporary installation of HG")
350 350 installerrs = os.path.join("tests", "install.err")
351 351 pure = options.pure and "--pure" or ""
352 352
353 353 # Run installer in hg root
354 354 script = os.path.realpath(sys.argv[0])
355 355 hgroot = os.path.dirname(os.path.dirname(script))
356 356 os.chdir(hgroot)
357 357 nohome = '--home=""'
358 358 if os.name == 'nt':
359 359 # The --home="" trick works only on OS where os.sep == '/'
360 360 # because of a distutils convert_path() fast-path. Avoid it at
361 361 # least on Windows for now, deal with .pydistutils.cfg bugs
362 362 # when they happen.
363 363 nohome = ''
364 364 cmd = ('%s setup.py %s clean --all'
365 365 ' build --build-base="%s"'
366 366 ' install --force --prefix="%s" --install-lib="%s"'
367 367 ' --install-scripts="%s" %s >%s 2>&1'
368 368 % (sys.executable, pure, os.path.join(HGTMP, "build"),
369 369 INST, PYTHONDIR, BINDIR, nohome, installerrs))
370 370 vlog("# Running", cmd)
371 371 if os.system(cmd) == 0:
372 372 if not options.verbose:
373 373 os.remove(installerrs)
374 374 else:
375 375 f = open(installerrs)
376 376 for line in f:
377 377 print line,
378 378 f.close()
379 379 sys.exit(1)
380 380 os.chdir(TESTDIR)
381 381
382 382 usecorrectpython()
383 383
384 384 vlog("# Installing dummy diffstat")
385 385 f = open(os.path.join(BINDIR, 'diffstat'), 'w')
386 386 f.write('#!' + sys.executable + '\n'
387 387 'import sys\n'
388 388 'files = 0\n'
389 389 'for line in sys.stdin:\n'
390 390 ' if line.startswith("diff "):\n'
391 391 ' files += 1\n'
392 392 'sys.stdout.write("files patched: %d\\n" % files)\n')
393 393 f.close()
394 394 os.chmod(os.path.join(BINDIR, 'diffstat'), 0700)
395 395
396 396 if options.py3k_warnings and not options.anycoverage:
397 397 vlog("# Updating hg command to enable Py3k Warnings switch")
398 398 f = open(os.path.join(BINDIR, 'hg'), 'r')
399 399 lines = [line.rstrip() for line in f]
400 400 lines[0] += ' -3'
401 401 f.close()
402 402 f = open(os.path.join(BINDIR, 'hg'), 'w')
403 403 for line in lines:
404 404 f.write(line + '\n')
405 405 f.close()
406 406
407 407 if options.anycoverage:
408 408 custom = os.path.join(TESTDIR, 'sitecustomize.py')
409 409 target = os.path.join(PYTHONDIR, 'sitecustomize.py')
410 410 vlog('# Installing coverage trigger to %s' % target)
411 411 shutil.copyfile(custom, target)
412 412 rc = os.path.join(TESTDIR, '.coveragerc')
413 413 vlog('# Installing coverage rc to %s' % rc)
414 414 os.environ['COVERAGE_PROCESS_START'] = rc
415 415 fn = os.path.join(INST, '..', '.coverage')
416 416 os.environ['COVERAGE_FILE'] = fn
417 417
418 418 def outputcoverage(options):
419 419
420 420 vlog('# Producing coverage report')
421 421 os.chdir(PYTHONDIR)
422 422
423 423 def covrun(*args):
424 424 cmd = 'coverage %s' % ' '.join(args)
425 425 vlog('# Running: %s' % cmd)
426 426 os.system(cmd)
427 427
428 428 if options.child:
429 429 return
430 430
431 431 covrun('-c')
432 432 omit = ','.join([BINDIR, TESTDIR])
433 433 covrun('-i', '-r', '"--omit=%s"' % omit) # report
434 434 if options.annotate:
435 435 adir = os.path.join(TESTDIR, 'annotated')
436 436 if not os.path.isdir(adir):
437 437 os.mkdir(adir)
438 438 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
439 439
440 440 class Timeout(Exception):
441 441 pass
442 442
443 443 def alarmed(signum, frame):
444 444 raise Timeout
445 445
446 446 def pytest(test, options, replacements):
447 447 py3kswitch = options.py3k_warnings and ' -3' or ''
448 448 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
449 449 vlog("# Running", cmd)
450 450 return run(cmd, options, replacements)
451 451
452 452 def shtest(test, options, replacements):
453 453 cmd = '"%s"' % test
454 454 vlog("# Running", cmd)
455 455 return run(cmd, options, replacements)
456 456
457 457 def tsttest(test, options, replacements):
458 458 t = open(test)
459 459 out = []
460 460 script = []
461 461 salt = "SALT" + str(time.time())
462 462
463 463 pos = prepos = -1
464 464 after = {}
465 465 expected = {}
466 466 for n, l in enumerate(t):
467 467 if l.startswith(' $ '): # commands
468 468 after.setdefault(pos, []).append(l)
469 469 prepos = pos
470 470 pos = n
471 471 script.append('echo %s %s $?\n' % (salt, n))
472 472 script.append(l[4:])
473 473 elif l.startswith(' > '): # continuations
474 474 after.setdefault(prepos, []).append(l)
475 475 script.append(l[4:])
476 476 elif l.startswith(' '): # results
477 477 # queue up a list of expected results
478 478 expected.setdefault(pos, []).append(l[2:])
479 479 else:
480 480 # non-command/result - queue up for merged output
481 481 after.setdefault(pos, []).append(l)
482 482
483 483 if script and not script[-1].endswith('\n'):
484 484 script[-1] = script[-1] + '\n'
485 485 script.append('echo %s %s $?\n' % (salt, n + 1))
486 486
487 487 fd, name = tempfile.mkstemp(suffix='hg-tst')
488 488
489 489 try:
490 490 for l in script:
491 491 os.write(fd, l)
492 492 os.close(fd)
493 493
494 494 cmd = '/bin/sh "%s"' % name
495 495 vlog("# Running", cmd)
496 496 exitcode, output = run(cmd, options, replacements)
497 497 # do not merge output if skipped, return hghave message instead
498 498 if exitcode == SKIPPED_STATUS:
499 499 return exitcode, output
500 500 finally:
501 501 os.remove(name)
502 502
503 503 def rematch(el, l):
504 504 try:
505 505 # ensure that the regex matches to the end of the string
506 506 return re.match(el + r'\Z', l)
507 507 except re.error:
508 508 # el is an invalid regex
509 509 return False
510 510
511 511 def globmatch(el, l):
512 512 # The only supported special characters are * and ?. Escaping is
513 513 # supported.
514 514 i, n = 0, len(el)
515 515 res = ''
516 516 while i < n:
517 517 c = el[i]
518 518 i += 1
519 519 if c == '\\' and el[i] in '*?\\':
520 520 res += el[i - 1:i + 1]
521 521 i += 1
522 522 elif c == '*':
523 523 res += '.*'
524 524 elif c == '?':
525 525 res += '.'
526 526 else:
527 527 res += re.escape(c)
528 528 return rematch(res, l)
529 529
530 530 pos = -1
531 531 postout = []
532 532 ret = 0
533 533 for n, l in enumerate(output):
534 534 if l.startswith(salt):
535 535 # add on last return code
536 536 ret = int(l.split()[2])
537 537 if ret != 0:
538 538 postout.append(" [%s]\n" % ret)
539 539 if pos in after:
540 540 postout += after.pop(pos)
541 541 pos = int(l.split()[1])
542 542 else:
543 543 el = None
544 544 if pos in expected and expected[pos]:
545 545 el = expected[pos].pop(0)
546 546
547 547 if el == l: # perfect match (fast)
548 548 postout.append(" " + l)
549 elif el and el.decode('string-escape') == l:
550 postout.append(" " + el) # \-escape match
549 551 elif (el and
550 552 (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
551 553 el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l))):
552 554 postout.append(" " + el) # fallback regex/glob match
553 555 else:
554 556 postout.append(" " + l) # let diff deal with it
555 557
556 558 if pos in after:
557 559 postout += after.pop(pos)
558 560
559 561 return exitcode, postout
560 562
561 563 def run(cmd, options, replacements):
562 564 """Run command in a sub-process, capturing the output (stdout and stderr).
563 565 Return a tuple (exitcode, output). output is None in debug mode."""
564 566 # TODO: Use subprocess.Popen if we're running on Python 2.4
565 567 if options.debug:
566 568 proc = subprocess.Popen(cmd, shell=True)
567 569 ret = proc.wait()
568 570 return (ret, None)
569 571
570 572 if os.name == 'nt' or sys.platform.startswith('java'):
571 573 tochild, fromchild = os.popen4(cmd)
572 574 tochild.close()
573 575 output = fromchild.read()
574 576 ret = fromchild.close()
575 577 if ret == None:
576 578 ret = 0
577 579 else:
578 580 proc = Popen4(cmd)
579 581 def cleanup():
580 582 os.kill(proc.pid, signal.SIGTERM)
581 583 ret = proc.wait()
582 584 if ret == 0:
583 585 ret = signal.SIGTERM << 8
584 586 killdaemons()
585 587 return ret
586 588
587 589 try:
588 590 output = ''
589 591 proc.tochild.close()
590 592 output = proc.fromchild.read()
591 593 ret = proc.wait()
592 594 if os.WIFEXITED(ret):
593 595 ret = os.WEXITSTATUS(ret)
594 596 except Timeout:
595 597 vlog('# Process %d timed out - killing it' % proc.pid)
596 598 ret = cleanup()
597 599 output += ("\n### Abort: timeout after %d seconds.\n"
598 600 % options.timeout)
599 601 except KeyboardInterrupt:
600 602 vlog('# Handling keyboard interrupt')
601 603 cleanup()
602 604 raise
603 605
604 606 for s, r in replacements:
605 607 output = output.replace(s, r)
606 608 return ret, splitnewlines(output)
607 609
608 610 def runone(options, test, skips, fails):
609 611 '''tristate output:
610 612 None -> skipped
611 613 True -> passed
612 614 False -> failed'''
613 615
614 616 def skip(msg):
615 617 if not options.verbose:
616 618 skips.append((test, msg))
617 619 else:
618 620 print "\nSkipping %s: %s" % (testpath, msg)
619 621 return None
620 622
621 623 def fail(msg):
622 624 fails.append((test, msg))
623 625 if not options.nodiff:
624 626 print "\nERROR: %s %s" % (testpath, msg)
625 627 return None
626 628
627 629 vlog("# Test", test)
628 630
629 631 # create a fresh hgrc
630 632 hgrc = open(HGRCPATH, 'w+')
631 633 hgrc.write('[ui]\n')
632 634 hgrc.write('slash = True\n')
633 635 hgrc.write('[defaults]\n')
634 636 hgrc.write('backout = -d "0 0"\n')
635 637 hgrc.write('commit = -d "0 0"\n')
636 638 hgrc.write('tag = -d "0 0"\n')
637 639 if options.inotify:
638 640 hgrc.write('[extensions]\n')
639 641 hgrc.write('inotify=\n')
640 642 hgrc.write('[inotify]\n')
641 643 hgrc.write('pidfile=%s\n' % DAEMON_PIDS)
642 644 hgrc.write('appendpid=True\n')
643 645 hgrc.close()
644 646
645 647 testpath = os.path.join(TESTDIR, test)
646 648 ref = os.path.join(TESTDIR, test+".out")
647 649 err = os.path.join(TESTDIR, test+".err")
648 650 if os.path.exists(err):
649 651 os.remove(err) # Remove any previous output files
650 652 try:
651 653 tf = open(testpath)
652 654 firstline = tf.readline().rstrip()
653 655 tf.close()
654 656 except:
655 657 firstline = ''
656 658 lctest = test.lower()
657 659
658 660 if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
659 661 runner = pytest
660 662 elif lctest.endswith('.t'):
661 663 runner = tsttest
662 664 ref = testpath
663 665 else:
664 666 # do not try to run non-executable programs
665 667 if not os.access(testpath, os.X_OK):
666 668 return skip("not executable")
667 669 runner = shtest
668 670
669 671 # Make a tmp subdirectory to work in
670 672 testtmp = os.environ["TESTTMP"] = os.path.join(HGTMP, test)
671 673 os.mkdir(testtmp)
672 674 os.chdir(testtmp)
673 675
674 676 if options.timeout > 0:
675 677 signal.alarm(options.timeout)
676 678
677 679 ret, out = runner(testpath, options, [
678 680 (testtmp, '$TESTTMP'),
679 681 (':%s' % options.port, ':$HGPORT'),
680 682 (':%s' % (options.port + 1), ':$HGPORT1'),
681 683 (':%s' % (options.port + 2), ':$HGPORT2'),
682 684 ])
683 685 vlog("# Ret was:", ret)
684 686
685 687 if options.timeout > 0:
686 688 signal.alarm(0)
687 689
688 690 mark = '.'
689 691
690 692 skipped = (ret == SKIPPED_STATUS)
691 693
692 694 # If we're not in --debug mode and reference output file exists,
693 695 # check test output against it.
694 696 if options.debug:
695 697 refout = None # to match out == None
696 698 elif os.path.exists(ref):
697 699 f = open(ref, "r")
698 700 refout = splitnewlines(f.read())
699 701 f.close()
700 702 else:
701 703 refout = []
702 704
703 705 if (ret != 0 or out != refout) and not skipped and not options.debug:
704 706 # Save errors to a file for diagnosis
705 707 f = open(err, "wb")
706 708 for line in out:
707 709 f.write(line)
708 710 f.close()
709 711
710 712 if skipped:
711 713 mark = 's'
712 714 if out is None: # debug mode: nothing to parse
713 715 missing = ['unknown']
714 716 failed = None
715 717 else:
716 718 missing, failed = parsehghaveoutput(out)
717 719 if not missing:
718 720 missing = ['irrelevant']
719 721 if failed:
720 722 fail("hghave failed checking for %s" % failed[-1])
721 723 skipped = False
722 724 else:
723 725 skip(missing[-1])
724 726 elif out != refout:
725 727 mark = '!'
726 728 if ret:
727 729 fail("output changed and returned error code %d" % ret)
728 730 else:
729 731 fail("output changed")
730 732 if not options.nodiff:
731 733 if options.view:
732 734 os.system("%s %s %s" % (options.view, ref, err))
733 735 else:
734 736 showdiff(refout, out, ref, err)
735 737 ret = 1
736 738 elif ret:
737 739 mark = '!'
738 740 fail("returned error code %d" % ret)
739 741
740 742 if not options.verbose:
741 743 sys.stdout.write(mark)
742 744 sys.stdout.flush()
743 745
744 746 killdaemons()
745 747
746 748 os.chdir(TESTDIR)
747 749 if not options.keep_tmpdir:
748 750 shutil.rmtree(testtmp, True)
749 751 if skipped:
750 752 return None
751 753 return ret == 0
752 754
753 755 _hgpath = None
754 756
755 757 def _gethgpath():
756 758 """Return the path to the mercurial package that is actually found by
757 759 the current Python interpreter."""
758 760 global _hgpath
759 761 if _hgpath is not None:
760 762 return _hgpath
761 763
762 764 cmd = '%s -c "import mercurial; print mercurial.__path__[0]"'
763 765 pipe = os.popen(cmd % PYTHON)
764 766 try:
765 767 _hgpath = pipe.read().strip()
766 768 finally:
767 769 pipe.close()
768 770 return _hgpath
769 771
770 772 def _checkhglib(verb):
771 773 """Ensure that the 'mercurial' package imported by python is
772 774 the one we expect it to be. If not, print a warning to stderr."""
773 775 expecthg = os.path.join(PYTHONDIR, 'mercurial')
774 776 actualhg = _gethgpath()
775 777 if actualhg != expecthg:
776 778 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
777 779 ' (expected %s)\n'
778 780 % (verb, actualhg, expecthg))
779 781
780 782 def runchildren(options, tests):
781 783 if INST:
782 784 installhg(options)
783 785 _checkhglib("Testing")
784 786
785 787 optcopy = dict(options.__dict__)
786 788 optcopy['jobs'] = 1
787 789 del optcopy['blacklist']
788 790 if optcopy['with_hg'] is None:
789 791 optcopy['with_hg'] = os.path.join(BINDIR, "hg")
790 792 optcopy.pop('anycoverage', None)
791 793
792 794 opts = []
793 795 for opt, value in optcopy.iteritems():
794 796 name = '--' + opt.replace('_', '-')
795 797 if value is True:
796 798 opts.append(name)
797 799 elif value is not None:
798 800 opts.append(name + '=' + str(value))
799 801
800 802 tests.reverse()
801 803 jobs = [[] for j in xrange(options.jobs)]
802 804 while tests:
803 805 for job in jobs:
804 806 if not tests:
805 807 break
806 808 job.append(tests.pop())
807 809 fps = {}
808 810
809 811 for j, job in enumerate(jobs):
810 812 if not job:
811 813 continue
812 814 rfd, wfd = os.pipe()
813 815 childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
814 816 childtmp = os.path.join(HGTMP, 'child%d' % j)
815 817 childopts += ['--tmpdir', childtmp]
816 818 cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job
817 819 vlog(' '.join(cmdline))
818 820 fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
819 821 os.close(wfd)
820 822 signal.signal(signal.SIGINT, signal.SIG_IGN)
821 823 failures = 0
822 824 tested, skipped, failed = 0, 0, 0
823 825 skips = []
824 826 fails = []
825 827 while fps:
826 828 pid, status = os.wait()
827 829 fp = fps.pop(pid)
828 830 l = fp.read().splitlines()
829 831 try:
830 832 test, skip, fail = map(int, l[:3])
831 833 except ValueError:
832 834 test, skip, fail = 0, 0, 0
833 835 split = -fail or len(l)
834 836 for s in l[3:split]:
835 837 skips.append(s.split(" ", 1))
836 838 for s in l[split:]:
837 839 fails.append(s.split(" ", 1))
838 840 tested += test
839 841 skipped += skip
840 842 failed += fail
841 843 vlog('pid %d exited, status %d' % (pid, status))
842 844 failures |= status
843 845 print
844 846 if not options.noskips:
845 847 for s in skips:
846 848 print "Skipped %s: %s" % (s[0], s[1])
847 849 for s in fails:
848 850 print "Failed %s: %s" % (s[0], s[1])
849 851
850 852 _checkhglib("Tested")
851 853 print "# Ran %d tests, %d skipped, %d failed." % (
852 854 tested, skipped, failed)
853 855
854 856 if options.anycoverage:
855 857 outputcoverage(options)
856 858 sys.exit(failures != 0)
857 859
858 860 def runtests(options, tests):
859 861 global DAEMON_PIDS, HGRCPATH
860 862 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
861 863 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
862 864
863 865 try:
864 866 if INST:
865 867 installhg(options)
866 868 _checkhglib("Testing")
867 869
868 870 if options.timeout > 0:
869 871 try:
870 872 signal.signal(signal.SIGALRM, alarmed)
871 873 vlog('# Running each test with %d second timeout' %
872 874 options.timeout)
873 875 except AttributeError:
874 876 print 'WARNING: cannot run tests with timeouts'
875 877 options.timeout = 0
876 878
877 879 tested = 0
878 880 failed = 0
879 881 skipped = 0
880 882
881 883 if options.restart:
882 884 orig = list(tests)
883 885 while tests:
884 886 if os.path.exists(tests[0] + ".err"):
885 887 break
886 888 tests.pop(0)
887 889 if not tests:
888 890 print "running all tests"
889 891 tests = orig
890 892
891 893 skips = []
892 894 fails = []
893 895
894 896 for test in tests:
895 897 if options.blacklist:
896 898 filename = options.blacklist.get(test)
897 899 if filename is not None:
898 900 skips.append((test, "blacklisted (%s)" % filename))
899 901 skipped += 1
900 902 continue
901 903
902 904 if options.retest and not os.path.exists(test + ".err"):
903 905 skipped += 1
904 906 continue
905 907
906 908 if options.keywords:
907 909 t = open(test).read().lower() + test.lower()
908 910 for k in options.keywords.lower().split():
909 911 if k in t:
910 912 break
911 913 else:
912 914 skipped += 1
913 915 continue
914 916
915 917 ret = runone(options, test, skips, fails)
916 918 if ret is None:
917 919 skipped += 1
918 920 elif not ret:
919 921 if options.interactive:
920 922 print "Accept this change? [n] ",
921 923 answer = sys.stdin.readline().strip()
922 924 if answer.lower() in "y yes".split():
923 925 if test.endswith(".t"):
924 926 rename(test + ".err", test)
925 927 else:
926 928 rename(test + ".err", test + ".out")
927 929 tested += 1
928 930 fails.pop()
929 931 continue
930 932 failed += 1
931 933 if options.first:
932 934 break
933 935 tested += 1
934 936
935 937 if options.child:
936 938 fp = os.fdopen(options.child, 'w')
937 939 fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
938 940 for s in skips:
939 941 fp.write("%s %s\n" % s)
940 942 for s in fails:
941 943 fp.write("%s %s\n" % s)
942 944 fp.close()
943 945 else:
944 946 print
945 947 for s in skips:
946 948 print "Skipped %s: %s" % s
947 949 for s in fails:
948 950 print "Failed %s: %s" % s
949 951 _checkhglib("Tested")
950 952 print "# Ran %d tests, %d skipped, %d failed." % (
951 953 tested, skipped, failed)
952 954
953 955 if options.anycoverage:
954 956 outputcoverage(options)
955 957 except KeyboardInterrupt:
956 958 failed = True
957 959 print "\ninterrupted!"
958 960
959 961 if failed:
960 962 sys.exit(1)
961 963
962 964 def main():
963 965 (options, args) = parseargs()
964 966 if not options.child:
965 967 os.umask(022)
966 968
967 969 checktools()
968 970
969 971 if len(args) == 0:
970 972 args = os.listdir(".")
971 973 args.sort()
972 974
973 975 tests = []
974 976 skipped = []
975 977 for test in args:
976 978 if (test.startswith("test-") and '~' not in test and
977 979 ('.' not in test or test.endswith('.py') or
978 980 test.endswith('.bat') or test.endswith('.t'))):
979 981 if not os.path.exists(test):
980 982 skipped.append(test)
981 983 else:
982 984 tests.append(test)
983 985 if not tests:
984 986 for test in skipped:
985 987 print 'Skipped %s: does not exist' % test
986 988 print "# Ran 0 tests, %d skipped, 0 failed." % len(skipped)
987 989 return
988 990 tests = tests + skipped
989 991
990 992 # Reset some environment variables to well-known values so that
991 993 # the tests produce repeatable output.
992 994 os.environ['LANG'] = os.environ['LC_ALL'] = os.environ['LANGUAGE'] = 'C'
993 995 os.environ['TZ'] = 'GMT'
994 996 os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
995 997 os.environ['CDPATH'] = ''
996 998 os.environ['COLUMNS'] = '80'
997 999 os.environ['GREP_OPTIONS'] = ''
998 1000 os.environ['http_proxy'] = ''
999 1001
1000 1002 # unset env related to hooks
1001 1003 for k in os.environ.keys():
1002 1004 if k.startswith('HG_'):
1003 1005 # can't remove on solaris
1004 1006 os.environ[k] = ''
1005 1007 del os.environ[k]
1006 1008
1007 1009 global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
1008 1010 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
1009 1011 if options.tmpdir:
1010 1012 options.keep_tmpdir = True
1011 1013 tmpdir = options.tmpdir
1012 1014 if os.path.exists(tmpdir):
1013 1015 # Meaning of tmpdir has changed since 1.3: we used to create
1014 1016 # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if
1015 1017 # tmpdir already exists.
1016 1018 sys.exit("error: temp dir %r already exists" % tmpdir)
1017 1019
1018 1020 # Automatically removing tmpdir sounds convenient, but could
1019 1021 # really annoy anyone in the habit of using "--tmpdir=/tmp"
1020 1022 # or "--tmpdir=$HOME".
1021 1023 #vlog("# Removing temp dir", tmpdir)
1022 1024 #shutil.rmtree(tmpdir)
1023 1025 os.makedirs(tmpdir)
1024 1026 else:
1025 1027 tmpdir = tempfile.mkdtemp('', 'hgtests.')
1026 1028 HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir)
1027 1029 DAEMON_PIDS = None
1028 1030 HGRCPATH = None
1029 1031
1030 1032 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
1031 1033 os.environ["HGMERGE"] = "internal:merge"
1032 1034 os.environ["HGUSER"] = "test"
1033 1035 os.environ["HGENCODING"] = "ascii"
1034 1036 os.environ["HGENCODINGMODE"] = "strict"
1035 1037 os.environ["HGPORT"] = str(options.port)
1036 1038 os.environ["HGPORT1"] = str(options.port + 1)
1037 1039 os.environ["HGPORT2"] = str(options.port + 2)
1038 1040
1039 1041 if options.with_hg:
1040 1042 INST = None
1041 1043 BINDIR = os.path.dirname(os.path.realpath(options.with_hg))
1042 1044
1043 1045 # This looks redundant with how Python initializes sys.path from
1044 1046 # the location of the script being executed. Needed because the
1045 1047 # "hg" specified by --with-hg is not the only Python script
1046 1048 # executed in the test suite that needs to import 'mercurial'
1047 1049 # ... which means it's not really redundant at all.
1048 1050 PYTHONDIR = BINDIR
1049 1051 else:
1050 1052 INST = os.path.join(HGTMP, "install")
1051 1053 BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
1052 1054 PYTHONDIR = os.path.join(INST, "lib", "python")
1053 1055
1054 1056 os.environ["BINDIR"] = BINDIR
1055 1057 os.environ["PYTHON"] = PYTHON
1056 1058
1057 1059 if not options.child:
1058 1060 path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
1059 1061 os.environ["PATH"] = os.pathsep.join(path)
1060 1062
1061 1063 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
1062 1064 # can run .../tests/run-tests.py test-foo where test-foo
1063 1065 # adds an extension to HGRC
1064 1066 pypath = [PYTHONDIR, TESTDIR]
1065 1067 # We have to augment PYTHONPATH, rather than simply replacing
1066 1068 # it, in case external libraries are only available via current
1067 1069 # PYTHONPATH. (In particular, the Subversion bindings on OS X
1068 1070 # are in /opt/subversion.)
1069 1071 oldpypath = os.environ.get(IMPL_PATH)
1070 1072 if oldpypath:
1071 1073 pypath.append(oldpypath)
1072 1074 os.environ[IMPL_PATH] = os.pathsep.join(pypath)
1073 1075
1074 1076 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
1075 1077
1076 1078 vlog("# Using TESTDIR", TESTDIR)
1077 1079 vlog("# Using HGTMP", HGTMP)
1078 1080 vlog("# Using PATH", os.environ["PATH"])
1079 1081 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
1080 1082
1081 1083 try:
1082 1084 if len(tests) > 1 and options.jobs > 1:
1083 1085 runchildren(options, tests)
1084 1086 else:
1085 1087 runtests(options, tests)
1086 1088 finally:
1087 1089 time.sleep(1)
1088 1090 cleanup(options)
1089 1091
1090 1092 main()
General Comments 0
You need to be logged in to leave comments. Login now