Patchwork [4,of,4] tests: make test-inotify-issue1208.t disappear

login
register
mail settings
Submitter Bryan O'Sullivan
Date Dec. 19, 2012, 6:47 p.m.
Message ID <f9314e2a9392afca9681.1355942843@fedora>
Download mbox | patch
Permalink /patch/202/
State Accepted
Commit 8c4e4661a0cbda9651435d1bfd460533a38a1772
Headers show

Comments

Bryan O'Sullivan - Dec. 19, 2012, 6:47 p.m.
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1355942740 28800
# Node ID f9314e2a9392afca968142eed7ac671744173387
# Parent  547172cf2a975f7806f078285b3712f38ecb53f5
tests: make test-inotify-issue1208.t disappear
Matt Mackall - Dec. 19, 2012, 11:40 p.m.
On Wed, 2012-12-19 at 10:47 -0800, Bryan O'Sullivan wrote:
> # HG changeset patch
> # User Bryan O'Sullivan <bryano at fb.com>
> # Date 1355942740 28800
> # Node ID f9314e2a9392afca968142eed7ac671744173387
> # Parent  547172cf2a975f7806f078285b3712f38ecb53f5
> tests: make test-inotify-issue1208.t disappear

These look fine. Feel free to push.

Patch

diff --git a/tests/test-inotify-issue1208.t b/tests/test-inotify-issue1208.t
deleted file mode 100644
--- a/tests/test-inotify-issue1208.t
+++ /dev/null
@@ -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 ..
diff --git a/tests/test-inotify.t b/tests/test-inotify.t
--- a/tests/test-inotify.t
+++ b/tests/test-inotify.t
@@ -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`