tests: unify test-inotify-issue1208

tests/test-inotify-issue1208.t

@@ -1,24 +1,29
-#!/bin/sh
-
-"$TESTDIR/hghave" inotify || exit 80
 
-echo "[extensions]" >> $HGRCPATH
-echo "inotify=" >> $HGRCPATH
+  $ "$TESTDIR/hghave" inotify || exit 80
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "inotify=" >> $HGRCPATH
+  $ p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  $ hg init $p
+  $ cd $p
 
-p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-hg init $p
-cd $p
+fail
 
-echo % fail
-ln -sf doesnotexist .hg/inotify.sock
-hg st
-hg inserve
-rm .hg/inotify.sock
+  $ ln -sf doesnotexist .hg/inotify.sock
+  $ hg st
+  abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
+  inotify-client: could not start inotify server: child process failed to start
+  $ hg inserve
+  abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
+  [255]
+  $ rm .hg/inotify.sock
 
-echo % inserve
-hg inserve -d --pid-file=hg.pid
-cat hg.pid >> "$DAEMON_PIDS"
-echo % status
-hg status
+inserve
+
+  $ hg inserve -d --pid-file=hg.pid
+  $ cat hg.pid >> "$DAEMON_PIDS"
 
-kill `cat hg.pid`
+status
+
+  $ hg status
+  ? hg.pid
+  $ kill `cat hg.pid`