# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1285526601 18000
# Node ID f727db60abb41a21df018fa4b3a10dc182787048
# Parent  17ebf11bff81f3b9f64361b5739a49519b56d0a7
tests: unify test-inotify-dirty-dirstate

diff -r 17ebf11bff81 -r f727db60abb4 tests/test-inotify-dirty-dirstate
--- a/tests/test-inotify-dirty-dirstate	Sun Sep 26 13:43:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# issues when status queries are issued when dirstate is dirty
-
-"$TESTDIR/hghave" inotify || exit 80
-
-echo "[extensions]" >> $HGRCPATH
-echo "inotify=" >> $HGRCPATH
-echo "fetch=" >> $HGRCPATH
-
-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
-hg ci -m foo
-
-cd ..
-
-hg --config "inotify.pidfile=../hg2.pid" clone test test2
-cat ../hg2.pid >> "$DAEMON_PIDS"
-
-cd test2
-echo bar > bar
-hg add
-hg ci -m bar
-cd ../test
-echo spam > spam
-hg add
-hg ci -m spam
-cd ../test2
-hg st
-
-# abort, outstanding changes
-hg fetch -q
-hg st
-cd ..
-
-
-echo % issue1719: inotify and mq
-
-echo "mq=" >> $HGRCPATH
-
-hg init test-1719
-cd test-1719
-
-echo % inserve
-hg inserve -d --pid-file=../hg-test-1719.pid
-cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
-
-echo content > file
-hg add file
-
-hg qnew -f test.patch
-
-hg status
-hg qpop
-
-echo % st should not output anything
-hg status
-
-hg qpush
-
-echo % st should not output anything
-hg status
-
-hg qrefresh
-hg status
diff -r 17ebf11bff81 -r f727db60abb4 tests/test-inotify-dirty-dirstate.out
--- a/tests/test-inotify-dirty-dirstate.out	Sun Sep 26 13:43:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-% issue1810: inotify and fetch
-adding foo
-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
-popping test.patch
-patch queue now empty
-% st should not output anything
-applying test.patch
-now at: test.patch
-% st should not output anything
diff -r 17ebf11bff81 -r f727db60abb4 tests/test-inotify-dirty-dirstate.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-inotify-dirty-dirstate.t	Sun Sep 26 13:43:21 2010 -0500
@@ -0,0 +1,71 @@
+issues when status queries are issued when dirstate is dirty
+
+  $ "$TESTDIR/hghave" inotify || exit 80
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "inotify=" >> $HGRCPATH
+  $ echo "fetch=" >> $HGRCPATH
+
+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
+  adding foo
+  $ hg ci -m foo
+  $ cd ..
+  $ hg --config "inotify.pidfile=../hg2.pid" clone test test2
+  updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cat ../hg2.pid >> "$DAEMON_PIDS"
+  $ cd test2
+  $ echo bar > bar
+  $ hg add
+  adding bar
+  $ hg ci -m bar
+  $ cd ../test
+  $ echo spam > spam
+  $ hg add
+  adding spam
+  $ hg ci -m spam
+  $ cd ../test2
+  $ hg st
+
+abort, outstanding changes
+
+  $ hg fetch -q
+  $ hg st
+  $ cd ..
+
+issue1719: inotify and mq
+
+  $ echo "mq=" >> $HGRCPATH
+  $ hg init test-1719
+  $ cd test-1719
+
+inserve
+
+  $ hg inserve -d --pid-file=../hg-test-1719.pid
+  $ cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
+  $ echo content > file
+  $ hg add file
+  $ hg qnew -f test.patch
+  $ hg status
+  $ hg qpop
+  popping test.patch
+  patch queue now empty
+
+st should not output anything
+
+  $ hg status
+  $ hg qpush
+  applying test.patch
+  now at: test.patch
+
+st should not output anything
+
+  $ hg status
+  $ hg qrefresh
+  $ hg status