equal
deleted
inserted
replaced
384 |
384 |
385 def killdaemons(pidfile): |
385 def killdaemons(pidfile): |
386 return killmod.killdaemons(pidfile, tryhard=False, remove=True, |
386 return killmod.killdaemons(pidfile, tryhard=False, remove=True, |
387 logfn=vlog) |
387 logfn=vlog) |
388 |
388 |
389 def outputtimes(options): |
|
390 vlog('# Producing time report') |
|
391 times.sort(key=lambda t: (t[1], t[0]), reverse=True) |
|
392 cols = '%7.3f %s' |
|
393 print '\n%-7s %s' % ('Time', 'Test') |
|
394 for test, timetaken in times: |
|
395 print cols % (timetaken, test) |
|
396 |
|
397 def outputcoverage(runner): |
389 def outputcoverage(runner): |
398 |
390 |
399 vlog('# Producing coverage report') |
391 vlog('# Producing coverage report') |
400 os.chdir(runner.pythondir) |
392 os.chdir(runner.pythondir) |
401 |
393 |
1124 print "# Ran %d tests, %d skipped, %d warned, %d failed." % ( |
1116 print "# Ran %d tests, %d skipped, %d warned, %d failed." % ( |
1125 tested, skipped + ignored, warned, failed) |
1117 tested, skipped + ignored, warned, failed) |
1126 if results['!']: |
1118 if results['!']: |
1127 print 'python hash seed:', os.environ['PYTHONHASHSEED'] |
1119 print 'python hash seed:', os.environ['PYTHONHASHSEED'] |
1128 if runner.options.time: |
1120 if runner.options.time: |
1129 outputtimes(runner.options) |
1121 runner.outputtimes() |
1130 |
1122 |
1131 if runner.options.anycoverage: |
1123 if runner.options.anycoverage: |
1132 outputcoverage(runner) |
1124 outputcoverage(runner) |
1133 except KeyboardInterrupt: |
1125 except KeyboardInterrupt: |
1134 failed = True |
1126 failed = True |
1299 if os.path.abspath(actualhg) != os.path.abspath(expecthg): |
1291 if os.path.abspath(actualhg) != os.path.abspath(expecthg): |
1300 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n' |
1292 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n' |
1301 ' (expected %s)\n' |
1293 ' (expected %s)\n' |
1302 % (verb, actualhg, expecthg)) |
1294 % (verb, actualhg, expecthg)) |
1303 |
1295 |
|
1296 def outputtimes(self): |
|
1297 vlog('# Producing time report') |
|
1298 times.sort(key=lambda t: (t[1], t[0]), reverse=True) |
|
1299 cols = '%7.3f %s' |
|
1300 print '\n%-7s %s' % ('Time', 'Test') |
|
1301 for test, timetaken in times: |
|
1302 print cols % (timetaken, test) |
|
1303 |
1304 def main(args, parser=None): |
1304 def main(args, parser=None): |
1305 runner = TestRunner() |
1305 runner = TestRunner() |
1306 |
1306 |
1307 parser = parser or getparser() |
1307 parser = parser or getparser() |
1308 (options, args) = parseargs(args, parser) |
1308 (options, args) = parseargs(args, parser) |