[PATCH 5 of 8] test-serve: kill daemons before deleting the access and error logs

Matt Harbison mharbison72 at gmail.com
Sun Apr 2 19:12:51 EDT 2017


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1491110885 14400
#      Sun Apr 02 01:28:05 2017 -0400
# Node ID 3196a52c528f537c04a9fdc61d6ee0f75ffb3223
# Parent  b574417618632d500281b17ff0caf8cc78a3e2a0
test-serve: kill daemons before deleting the access and error logs

On Windows, `rm` will fail with 'Permission denied' if another process has it
open.  It looks like the rollback test was missing the kill entirely.

diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -441,7 +441,7 @@
   1 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+  $ killdaemons.py
   $ rm hg.pid access.log
-  $ killdaemons.py
 
 #endif
diff --git a/tests/test-rollback.t b/tests/test-rollback.t
--- a/tests/test-rollback.t
+++ b/tests/test-rollback.t
@@ -148,6 +148,8 @@
   working directory now based on revision 0
   $ hg id default
   791dd2169706
+
+  $ killdaemons.py
 #endif
 
 update to older changeset and then refuse rollback, because


More information about the Mercurial-devel mailing list