--- a/tests/test-pull-http Sun Sep 26 13:44:49 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-cp "$TESTDIR"/printenv.py .
-
-hg init test
-cd test
-echo a > a
-hg ci -Ama
-
-cd ..
-hg clone test test2
-cd test2
-echo a >> a
-hg ci -mb
-
-echo % expect error, cloning not allowed
-echo '[web]' > .hg/hgrc
-echo 'allowpull = false' >> .hg/hgrc
-hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
-cat hg.pid >> $DAEMON_PIDS
-hg clone http://localhost:$HGPORT/ test3 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
-"$TESTDIR/killdaemons.py"
-echo % serve errors
-cat errors.log
-
-req() {
- hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
- cat hg.pid >> $DAEMON_PIDS
- hg --cwd ../test pull http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
- kill `cat hg.pid`
- echo % serve errors
- cat errors.log
-}
-
-echo % expect error, pulling not allowed
-req
--- a/tests/test-pull-http.out Sun Sep 26 13:44:49 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-adding a
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% expect error, cloning not allowed
-abort: authorization failed
-requesting all changes
-% serve errors
-% expect error, pulling not allowed
-abort: authorization failed
-pulling from http://localhost:$HGPORT/
-searching for changes
-% serve errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull-http.t Sun Sep 26 13:44:49 2010 -0500
@@ -0,0 +1,46 @@
+
+ $ cp "$TESTDIR"/printenv.py .
+ $ hg init test
+ $ cd test
+ $ echo a > a
+ $ hg ci -Ama
+ adding a
+ $ cd ..
+ $ hg clone test test2
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cd test2
+ $ echo a >> a
+ $ hg ci -mb
+
+expect error, cloning not allowed
+
+ $ echo '[web]' > .hg/hgrc
+ $ echo 'allowpull = false' >> .hg/hgrc
+ $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
+ $ cat hg.pid >> $DAEMON_PIDS
+ $ hg clone http://localhost:$HGPORT/ test3
+ requesting all changes
+ abort: authorization failed
+ [255]
+ $ "$TESTDIR/killdaemons.py"
+
+serve errors
+
+ $ cat errors.log
+ $ req() {
+ > hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
+ > cat hg.pid >> $DAEMON_PIDS
+ > hg --cwd ../test pull http://localhost:$HGPORT/
+ > kill `cat hg.pid`
+ > echo % serve errors
+ > cat errors.log
+ > }
+
+expect error, pulling not allowed
+
+ $ req
+ pulling from http://localhost:*/ (glob)
+ searching for changes
+ abort: authorization failed
+ % serve errors