##// END OF EJS Templates
tests: shorten post-test sleeps...
Matt Mackall -
r16346:48692b41 default
parent child Browse files
Show More
@@ -75,7 +75,7 b' def Popen4(cmd, wd, timeout):'
75 def t():
75 def t():
76 start = time.time()
76 start = time.time()
77 while time.time() - start < timeout and p.returncode is None:
77 while time.time() - start < timeout and p.returncode is None:
78 time.sleep(1)
78 time.sleep(.1)
79 p.timeout = True
79 p.timeout = True
80 if p.returncode is None:
80 if p.returncode is None:
81 terminate(p)
81 terminate(p)
@@ -360,7 +360,7 b' def killdaemons():'
360 os.kill(pid, 0)
360 os.kill(pid, 0)
361 vlog('# Killing daemon process %d' % pid)
361 vlog('# Killing daemon process %d' % pid)
362 os.kill(pid, signal.SIGTERM)
362 os.kill(pid, signal.SIGTERM)
363 time.sleep(0.25)
363 time.sleep(0.1)
364 os.kill(pid, 0)
364 os.kill(pid, 0)
365 vlog('# Daemon process %d is stuck - really killing it' % pid)
365 vlog('# Daemon process %d is stuck - really killing it' % pid)
366 os.kill(pid, signal.SIGKILL)
366 os.kill(pid, signal.SIGKILL)
@@ -1275,7 +1275,7 b' def main():'
1275 else:
1275 else:
1276 runtests(options, tests)
1276 runtests(options, tests)
1277 finally:
1277 finally:
1278 time.sleep(1)
1278 time.sleep(.1)
1279 cleanup(options)
1279 cleanup(options)
1280
1280
1281 if __name__ == '__main__':
1281 if __name__ == '__main__':
General Comments 0
You need to be logged in to leave comments. Login now