changeset 18098:8c4e4661a0cb

tests: make test-inotify-issue1208.t disappear
author Bryan O'Sullivan <bryano@fb.com>
date Wed, 19 Dec 2012 10:45:40 -0800
parents ae54cff742e2
children 11748167a78e
files tests/test-inotify-issue1208.t tests/test-inotify.t
diffstat 2 files changed, 7 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-inotify-issue1208.t	Tue Dec 18 17:15:13 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-
-  $ "$TESTDIR/hghave" inotify || exit 80
-  $ echo "[extensions]" >> $HGRCPATH
-  $ echo "inotify=" >> $HGRCPATH
-  $ p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-  $ hg init $p
-  $ cd $p
-
-dangling symlink should be deleted
-
-  $ ln -sf doesnotexist .hg/inotify.sock
-  $ hg --config inotify.pidfile=../hg.pid st
-  $ kill `cat ../hg.pid`
-
-inserve
-
-  $ hg inserve -d --pid-file=hg.pid
-  $ cat hg.pid >> "$DAEMON_PIDS"
-
-status
-
-  $ hg status
-  ? hg.pid
-
-if we try to start twice the server, make sure we get a correct error
-
-  $ hg inserve -d --pid-file=hg2.pid
-  abort: inotify-server: cannot start: socket is already bound
-  abort: child process failed to start
-  [255]
-  $ kill `cat hg.pid`
-
-  $ cd ..
--- a/tests/test-inotify.t	Tue Dec 18 17:15:13 2012 -0800
+++ b/tests/test-inotify.t	Wed Dec 19 10:45:40 2012 -0800
@@ -172,4 +172,11 @@
   $ hg --config inotify.pidfile=hg3.pid clone -q ../../repo1
   $ readlink repo1/.hg/inotify.sock
   */inotify.sock (glob)
+
+Trying to start the server a second time should fail as usual.
+
+  $ hg --cwd repo1 inserve
+  abort: inotify-server: cannot start: socket is already bound
+  [255]
+
   $ kill `cat hg3.pid`