# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1258369083 -3600
# Node ID 951ec6c7d703de01fed4ccd4b404a0c116bb11a8
# Parent  ea38a2c1bdd3cbdf4c98b7e52f47c1c269fca1b6
inotify: workaround test-inotify-dirty-dirstate failures

- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed

diff -r ea38a2c1bdd3 -r 951ec6c7d703 tests/test-inotify-dirty-dirstate
--- a/tests/test-inotify-dirty-dirstate	Mon Nov 16 11:55:29 2009 +0100
+++ b/tests/test-inotify-dirty-dirstate	Mon Nov 16 11:58:03 2009 +0100
@@ -11,6 +11,8 @@
 echo % issue1810: inotify and fetch
 mkdir test; cd test
 hg init
+hg inserve -d --pid-file=../hg.pid
+cat ../hg.pid >> "$DAEMON_PIDS"
 
 echo foo > foo
 hg add
@@ -18,8 +20,10 @@
 
 cd ..
 
-hg clone test test2
+hg --config "extensions.inotify=!" clone test test2
 cd test2
+hg inserve -d --pid-file=../hg2.pid
+cat ../hg2.pid >> "$DAEMON_PIDS"
 echo bar > bar
 hg add
 hg ci -m bar
@@ -44,8 +48,8 @@
 cd test-1719
 
 echo % inserve
-hg inserve -d --pid-file=hg.pid
-cat hg.pid >> "$DAEMON_PIDS"
+hg inserve -d --pid-file=../hg-test-1719.pid
+cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
 
 echo content > file
 hg add file
diff -r ea38a2c1bdd3 -r 951ec6c7d703 tests/test-inotify-dirty-dirstate.out
--- a/tests/test-inotify-dirty-dirstate.out	Mon Nov 16 11:55:29 2009 +0100
+++ b/tests/test-inotify-dirty-dirstate.out	Mon Nov 16 11:58:03 2009 +0100
@@ -1,18 +1,14 @@
 % issue1810: inotify and fetch
 adding foo
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding bar
 adding spam
 % issue1719: inotify and mq
 % inserve
-? hg.pid
 popping test.patch
 patch queue now empty
 % st should not output anything
-? hg.pid
 applying test.patch
 now at: test.patch
 % st should not output anything
-? hg.pid
-? hg.pid