tests: unify test-inotify-issue1556

tests/test-inotify-issue1556

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" inotify || exit 80
-
-hg init
-
-touch a b
-hg add a b
-rm b
-
-echo % status without inotify
-hg st
-
-echo "[extensions]" >> $HGRCPATH
-echo "inotify=" >> $HGRCPATH
-
-echo % inserve
-hg inserve -d --pid-file=hg.pid 2>&1
-cat hg.pid >> "$DAEMON_PIDS"
-
-echo % status
-hg st
-
-sleep 1
-echo "Are we able to kill the service? if not, the service died on some error"
-kill `cat hg.pid`
-

tests/test-inotify-issue1556.out

@@ -1,9 +0,0 @@
-% status without inotify
-A a
-! b
-% inserve
-% status
-A a
-! b
-? hg.pid
-Are we able to kill the service? if not, the service died on some error

tests/test-inotify-issue1556.t

@@ -0,0 +1,31 @@
+
+  $ "$TESTDIR/hghave" inotify || exit 80
+  $ hg init
+  $ touch a b
+  $ hg add a b
+  $ rm b
+
+status without inotify
+
+  $ hg st
+  A a
+  ! b
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "inotify=" >> $HGRCPATH
+
+inserve
+
+  $ hg inserve -d --pid-file=hg.pid 2>&1
+  $ cat hg.pid >> "$DAEMON_PIDS"
+
+status
+
+  $ hg st
+  A a
+  ! b
+  ? hg.pid
+  $ sleep 1
+
+Are we able to kill the service? if not, the service died on some error
+
+  $ kill `cat hg.pid`