Patchwork [1,of,5] tests: kill daemons early, making breaking at "Accept" prompt safe

login
register
mail settings
Submitter Mads Kiilerich
Date Dec. 9, 2012, 10:52 p.m.
Message ID <523e4e8f278867da5699.1355093562@mk-desktop>
Download mbox | patch
Permalink /patch/34/
State Accepted
Commit 48f797ac0879774d394d6d2ca421b06f927a176f
Headers show

Comments

Mads Kiilerich - Dec. 9, 2012, 10:52 p.m.
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1355092396 -3600
# Node ID 523e4e8f278867da5699660f589f2ceca98027dc
# Parent  f3991bcf4f0ff43b43a1b1d0210925a629ef3b9c
tests: kill daemons early, making breaking at "Accept" prompt safe

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -921,6 +921,8 @@ 
         times.append((test, endtime - starttime))
     vlog("# Ret was:", ret)
 
+    killdaemons()
+
     mark = '.'
 
     skipped = (ret == SKIPPED_STATUS)
@@ -991,8 +993,6 @@ 
         sys.stdout.flush()
         iolock.release()
 
-    killdaemons()
-
     if not options.keep_tmpdir:
         shutil.rmtree(testtmp, True)
     if skipped: