test: comparison tests/run-tests.py

equal deleted inserted replaced

-:9bdbae6007cb
+:4da6285efe4c
 # (You could use any subset of the tests: test-s* happens to match
 # enough that it's worth doing parallel runs, few enough that it
 # completes fairly quickly, includes both shell and Python scripts, and
 # includes some scripts that run daemon processes.)
-from ConfigParser import ConfigParser
 import difflib
 import errno
 import optparse
 import os
+import signal
 import subprocess
 import shutil
 import signal
 import sys
 import tempfile
 parser.add_option("-3", "--py3k-warnings", action="store_true",
 help="enable Py3k warnings on Python 2.6+")
 parser.add_option("--inotify", action="store_true",
 help="enable inotify extension when running tests")
 parser.add_option("--blacklist", action="append",
-help="skip tests listed in the specified section of "
+help="skip tests listed in the specified blacklist file")
-"the blacklist file")
 for option, default in defaults.items():
 defaults[option] = int(os.environ.get(*default))
 parser.set_defaults(**defaults)
 (options, args) = parser.parse_args()
 options.timeout = 0
 if options.py3k_warnings:
 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
 parser.error('--py3k-warnings can only be used on Python 2.6+')
 if options.blacklist:
-configparser = ConfigParser()
-configparser.read("blacklist")
 blacklist = dict()
-for section in options.blacklist:
+for filename in options.blacklist:
-for (item, value) in configparser.items(section):
+try:
-blacklist["test-" + item] = section
+path = os.path.expanduser(os.path.expandvars(filename))
+f = open(path, "r")
+except IOError, err:
+if err.errno != errno.ENOENT:
+raise
+print "warning: no such blacklist file: %s" % filename
+continue
+for line in f.readlines():
+line = line.strip()
+if line and not line.startswith('#'):
+blacklist[line] = filename
 options.blacklist = blacklist
 return (options, args)
 def rename(src, dst):
 if n == -1:
 last = text[i:]
 if last:
 lines.append(last)
 return lines
-lines.append(text[i:n+1])
+lines.append(text[i:n + 1])
 i = n + 1
 def parsehghaveoutput(lines):
 '''Parse hghave log lines.
 Return tuple of lists (missing, failed):
 found = findprogram(p)
 if found:
 vlog("# Found prerequisite", p, "at", found)
 else:
 print "WARNING: Did not find prerequisite tool: "+p
+def killdaemons():
+# Kill off any leftover daemon processes
+try:
+fp = open(DAEMON_PIDS)
+for line in fp:
+try:
+pid = int(line)
+except ValueError:
+continue
+try:
+os.kill(pid, 0)
+vlog('# Killing daemon process %d' % pid)
+os.kill(pid, signal.SIGTERM)
+time.sleep(0.25)
+os.kill(pid, 0)
+vlog('# Daemon process %d is stuck - really killing it' % pid)
+os.kill(pid, signal.SIGKILL)
+except OSError, err:
+if err.errno != errno.ESRCH:
+raise
+fp.close()
+os.unlink(DAEMON_PIDS)
+except IOError:
+pass
 def cleanup(options):
 if not options.keep_tmpdir:
 vlog("# Cleaning up HGTMP", HGTMP)
 shutil.rmtree(HGTMP, True)
 ret = fromchild.close()
 if ret == None:
 ret = 0
 else:
 proc = Popen4(cmd)
+def cleanup():
+os.kill(proc.pid, signal.SIGTERM)
+ret = proc.wait()
+if ret == 0:
+ret = signal.SIGTERM << 8
+killdaemons()
+return ret
 try:
 output = ''
 proc.tochild.close()
 output = proc.fromchild.read()
 ret = proc.wait()
 if os.WIFEXITED(ret):
 ret = os.WEXITSTATUS(ret)
 except Timeout:
 vlog('# Process %d timed out - killing it' % proc.pid)
-os.kill(proc.pid, signal.SIGTERM)
+ret = cleanup()
-ret = proc.wait()
-if ret == 0:
-ret = signal.SIGTERM << 8
 output += ("\n### Abort: timeout after %d seconds.\n"
 % options.timeout)
+except KeyboardInterrupt:
+vlog('# Handling keyboard interrupt')
+cleanup()
+raise
 return ret, splitnewlines(output)
 def runone(options, test, skips, fails):
 '''tristate output:
 None -> skipped
 f = open(err, "wb")
 for line in out:
 f.write(line)
 f.close()
-# Kill off any leftover daemon processes
+killdaemons()
-try:
-fp = open(DAEMON_PIDS)
-for line in fp:
-try:
-pid = int(line)
-except ValueError:
-continue
-try:
-os.kill(pid, 0)
-vlog('# Killing daemon process %d' % pid)
-os.kill(pid, signal.SIGTERM)
-time.sleep(0.25)
-os.kill(pid, 0)
-vlog('# Daemon process %d is stuck - really killing it' % pid)
-os.kill(pid, signal.SIGKILL)
-except OSError, err:
-if err.errno != errno.ESRCH:
-raise
-fp.close()
-os.unlink(DAEMON_PIDS)
-except IOError:
-pass
 os.chdir(TESTDIR)
 if not options.keep_tmpdir:
 shutil.rmtree(tmpd, True)
 if skipped:
 tests.reverse()
 jobs = [[] for j in xrange(options.jobs)]
 while tests:
 for job in jobs:
-if not tests: break
+if not tests:
+break
 job.append(tests.pop())
 fps = {}
 for j, job in enumerate(jobs):
 if not job:
 continue
 rfd, wfd = os.pipe()
 childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
 childopts += ['--tmpdir', childtmp]
 cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job
 vlog(' '.join(cmdline))
 fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
 os.close(wfd)
+signal.signal(signal.SIGINT, signal.SIG_IGN)
 failures = 0
 tested, skipped, failed = 0, 0, 0
 skips = []
 fails = []
 while fps:
 pid, status = os.wait()
 fp = fps.pop(pid)
 l = fp.read().splitlines()
-test, skip, fail = map(int, l[:3])
+try:
+test, skip, fail = map(int, l[:3])
+except ValueError:
+test, skip, fail = 0, 0, 0
 split = -fail or len(l)
 for s in l[3:split]:
 skips.append(s.split(" ", 1))
 for s in l[split:]:
 fails.append(s.split(" ", 1))
 skips = []
 fails = []
 for test in tests:
 if options.blacklist:
-section = options.blacklist.get(test)
+filename = options.blacklist.get(test)
-if section is not None:
+if filename is not None:
-skips.append((test, "blacklisted (%s section)" % section))
+skips.append((test, "blacklisted (%s)" % filename))
 skipped += 1
 continue
 if options.retest and not os.path.exists(test + ".err"):
 skipped += 1
 t = open(test).read().lower() + test.lower()
 for k in options.keywords.lower().split():
 if k in t:
 break
 else:
-skipped +=1
+skipped += 1
 continue
 ret = runone(options, test, skips, fails)
 if ret is None:
 skipped += 1
 if len(tests) > 1 and options.jobs > 1:
 runchildren(options, tests)
 else:
 runtests(options, tests)
 finally:
+time.sleep(1)
 cleanup(options)
 main()

changeset 684	4da6285efe4c
parent 683	26ca426a04e1
child 692	5ac40b193130