mercurial-scm/hg: comparison tests/run-tests.py

equal deleted inserted replaced

-:b3399154505f
+:2d767c7c3df0
 def killdaemons(pidfile):
 return killmod.killdaemons(pidfile, tryhard=False, remove=True,
 logfn=vlog)
-def cleanup(runner, options):
+def cleanup(runner):
-if not options.keep_tmpdir:
+if runner.options.keep_tmpdir:
-vlog("# Cleaning up HGTMP", runner.hgtmp)
+return
-shutil.rmtree(runner.hgtmp, True)
-for f in createdfiles:
+vlog("# Cleaning up HGTMP", runner.hgtmp)
-try:
+shutil.rmtree(runner.hgtmp, True)
-os.remove(f)
+for f in createdfiles:
-except OSError:
+try:
-pass
+os.remove(f)
+except OSError:
+pass
 def usecorrectpython(runner):
 # some tests run python interpreter. they must use same
 # interpreter we use or bad things will happen.
 pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
 path.remove(exedir)
 os.environ['PATH'] = os.pathsep.join([exedir] + path)
 if not findprogram(pyexename):
 print "WARNING: Cannot find %s in search path" % pyexename
-def installhg(runner, options):
+def installhg(runner):
 vlog("# Performing temporary installation of HG")
 installerrs = os.path.join("tests", "install.err")
 compiler = ''
-if options.compiler:
+if runner.options.compiler:
-compiler = '--compiler ' + options.compiler
+compiler = '--compiler ' + runner.options.compiler
-pure = options.pure and "--pure" or ""
+pure = runner.options.pure and "--pure" or ""
 py3 = ''
 if sys.version_info[0] == 3:
 py3 = '--c2to3'
 # Run installer in hg root
 'prefix': runner.inst, 'libdir': runner.pythondir,
 'bindir': runner.bindir,
 'nohome': nohome, 'logfile': installerrs})
 vlog("# Running", cmd)
 if os.system(cmd) == 0:
-if not options.verbose:
+if not runner.options.verbose:
 os.remove(installerrs)
 else:
 f = open(installerrs)
 for line in f:
 print line,
 sys.exit(1)
 os.chdir(runner.testdir)
 usecorrectpython(runner)
-if options.py3k_warnings and not options.anycoverage:
+if runner.options.py3k_warnings and not runner.options.anycoverage:
 vlog("# Updating hg command to enable Py3k Warnings switch")
 f = open(os.path.join(runner.bindir, 'hg'), 'r')
 lines = [line.rstrip() for line in f]
 lines[0] += ' -3'
 f.close()
 f.write(data)
 f.close()
 else:
 print 'WARNING: cannot fix hg.bat reference to python.exe'
-if options.anycoverage:
+if runner.options.anycoverage:
 custom = os.path.join(runner.testdir, 'sitecustomize.py')
 target = os.path.join(runner.pythondir, 'sitecustomize.py')
 vlog('# Installing coverage trigger to %s' % target)
 shutil.copyfile(custom, target)
 rc = os.path.join(runner.testdir, '.coveragerc')
 cols = '%7.3f   %s'
 print '\n%-7s   %s' % ('Time', 'Test')
 for test, timetaken in times:
 print cols % (timetaken, test)
-def outputcoverage(runner, options):
+def outputcoverage(runner):
 vlog('# Producing coverage report')
 os.chdir(runner.pythondir)
 def covrun(*args):
 covrun('-c')
 omit = ','.join(os.path.join(x, '*') for x in
 [runner.bindir, runner.testdir])
 covrun('-i', '-r', '"--omit=%s"' % omit) # report
-if options.htmlcov:
+if runner.options.htmlcov:
 htmldir = os.path.join(runner.testdir, 'htmlcov')
 covrun('-i', '-b', '"--directory=%s"' % htmldir, '"--omit=%s"' % omit)
-if options.annotate:
+if runner.options.annotate:
 adir = os.path.join(runner.testdir, 'annotated')
 if not os.path.isdir(adir):
 os.mkdir(adir)
 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
 Test instances can be run multiple times via run(). However, multiple
 runs cannot be run concurrently.
 """
-def __init__(self, runner, test, options, count, refpath):
+def __init__(self, runner, test, count, refpath):
 path = os.path.join(runner.testdir, test)
 errpath = os.path.join(runner.testdir, '%s.err' % test)
 self._testdir = runner.testdir
 self._test = test
 self._path = path
-self._options = options
+self._options = runner.options
 self._count = count
 self._daemonpids = []
 self._refpath = refpath
 self._errpath = errpath
 # If we're not in --debug mode and reference output file exists,
 # check test output against it.
-if options.debug:
+if runner.options.debug:
 self._refout = None # to match "out is None"
 elif os.path.exists(refpath):
 f = open(refpath, 'r')
 self._refout = f.read().splitlines(True)
 f.close()
 return TTest.globmatch(el[:-8], l)
 if os.altsep and l.replace('\\', '/') == el:
 return '+glob'
 return False
-def gettest(runner, test, options, count):
+def gettest(runner, test, count):
 """Obtain a Test by looking at its filename.
 Returns a Test instance. The Test may not be runnable if it doesn't map
 to a known type.
 """
 if lctest.endswith(ext):
 testcls = cls
 refpath = os.path.join(runner.testdir, test + out)
 break
-return testcls(runner, test, options, count, refpath)
+return testcls(runner, test, count, refpath)
 wifexited = getattr(os, "WIFEXITED", lambda x: False)
 def run(cmd, wd, options, replacements, env):
 """Run command in a sub-process, capturing the output (stdout and stderr).
 Return a tuple (exitcode, output).  output is None in debug mode."""
 results = {'.':[], '!':[], '~': [], 's':[], 'i':[]}
 times = []
 iolock = threading.Lock()
 abort = False
-def scheduletests(runner, options, tests):
+def scheduletests(runner, tests):
-jobs = options.jobs
+jobs = runner.options.jobs
 done = queue.Queue()
 running = 0
 count = 0
 global abort
 def job(test, count):
 try:
-t = gettest(runner, test, options, count)
+t = gettest(runner, test, count)
 done.put(t.run())
 t.cleanup()
 except KeyboardInterrupt:
 pass
 except: # re-raises
 while tests or running:
 if not done.empty() or running == jobs or not tests:
 try:
 code, test, msg = done.get(True, 1)
 results[code].append((test, msg))
-if options.first and code not in '.si':
+if runner.options.first and code not in '.si':
 break
 except queue.Empty:
 continue
 running -= 1
 if tests and not running == jobs:
 test = tests.pop(0)
-if options.loop:
+if runner.options.loop:
 tests.append(test)
 t = threading.Thread(target=job, name=test, args=(test, count))
 t.start()
 running += 1
 count += 1
 except KeyboardInterrupt:
 abort = True
-def runtests(runner, options, tests):
+def runtests(runner, tests):
 try:
 if runner.inst:
-installhg(runner, options)
+installhg(runner)
 _checkhglib(runner, "Testing")
 else:
 usecorrectpython(runner)
-if options.restart:
+if runner.options.restart:
 orig = list(tests)
 while tests:
 if os.path.exists(tests[0] + ".err"):
 break
 tests.pop(0)
 if not tests:
 print "running all tests"
 tests = orig
-scheduletests(runner, options, tests)
+scheduletests(runner, tests)
 failed = len(results['!'])
 warned = len(results['~'])
 tested = len(results['.']) + failed + warned
 skipped = len(results['s'])
 ignored = len(results['i'])
 print
-if not options.noskips:
+if not runner.options.noskips:
 for s in results['s']:
 print "Skipped %s: %s" % s
 for s in results['~']:
 print "Warned %s: %s" % s
 for s in results['!']:
 _checkhglib(runner, "Tested")
 print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
 tested, skipped + ignored, warned, failed)
 if results['!']:
 print 'python hash seed:', os.environ['PYTHONHASHSEED']
-if options.time:
+if runner.options.time:
-outputtimes(options)
+outputtimes(runner.options)
-if options.anycoverage:
+if runner.options.anycoverage:
-outputcoverage(runner, options)
+outputcoverage(runner)
 except KeyboardInterrupt:
 failed = True
 print "\ninterrupted!"
 if failed:
 vlog("# Using HGTMP", runner.hgtmp)
 vlog("# Using PATH", os.environ["PATH"])
 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
 try:
-return runtests(runner, options, tests) or 0
+return runtests(runner, tests) or 0
 finally:
 time.sleep(.1)
-cleanup(runner, options)
+cleanup(runner)
 if __name__ == '__main__':
 sys.exit(main(sys.argv[1:]))

changeset 21349	2d767c7c3df0
parent 21348	b3399154505f
child 21350	dfcef61f5bd4