test-serve: kill daemons before deleting the access and error logs
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 02 Apr 2017 01:28:05 -0400
changeset 31770 3ed26ba54685
parent 31769 594dd384803c
child 31771 5e92ba77793c
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.
tests/test-largefiles-wireproto.t
tests/test-rollback.t
--- a/tests/test-largefiles-wireproto.t	Sun Apr 02 00:56:52 2017 -0400
+++ b/tests/test-largefiles-wireproto.t	Sun Apr 02 01:28:05 2017 -0400
@@ -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
--- a/tests/test-rollback.t	Sun Apr 02 00:56:52 2017 -0400
+++ b/tests/test-rollback.t	Sun Apr 02 01:28:05 2017 -0400
@@ -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