Mercurial > hg
changeset 9859:951ec6c7d703
inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 16 Nov 2009 11:58:03 +0100 |
| parents | ea38a2c1bdd3 |
| children | 9c43089b372a |
| files | tests/test-inotify-dirty-dirstate tests/test-inotify-dirty-dirstate.out |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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