diff -r 378a8e700e02 -r 4d2b9b304ad0 tests/test-hgwebdir.t --- a/tests/test-hgwebdir.t Fri Jun 05 22:53:15 2015 -0400 +++ b/tests/test-hgwebdir.t Mon Jun 08 14:44:30 2015 -0500 @@ -84,7 +84,7 @@ should give a 404 - file does not exist - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/file/tip/bork?style=raw' + $ get-with-headers.py localhost:$HGPORT 'a/file/tip/bork?style=raw' 404 Not Found @@ -93,25 +93,25 @@ should succeed - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '?style=raw' + $ get-with-headers.py localhost:$HGPORT '?style=raw' 200 Script output follows /a/ /b/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT 'a/file/tip/a?style=raw' 200 Script output follows a - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'b/file/tip/b?style=raw' + $ get-with-headers.py localhost:$HGPORT 'b/file/tip/b?style=raw' 200 Script output follows b should give a 404 - repo is not published - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'c/file/tip/c?style=raw' + $ get-with-headers.py localhost:$HGPORT 'c/file/tip/c?style=raw' 404 Not Found @@ -120,14 +120,14 @@ atom-log without basedir - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/atom-log' | grep ' (glob) (glob) (glob) rss-log without basedir - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/rss-log' | grep 'http://*:$HGPORT/a/rev/8580ff50825a (glob) $ cat > paths.conf < [paths] @@ -145,7 +145,7 @@ should succeed, slashy names - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' + $ get-with-headers.py localhost:$HGPORT1 '?style=raw' 200 Script output follows @@ -184,7 +184,7 @@ /astar/ /astar/.hg/patches/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=paper' + $ get-with-headers.py localhost:$HGPORT1 '?style=paper' 200 Script output follows @@ -672,19 +672,19 @@ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't?style=raw' 200 Script output follows /t/a/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=paper' + $ get-with-headers.py localhost:$HGPORT1 't/?style=paper' 200 Script output follows @@ -743,7 +743,7 @@ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a?style=atom' + $ get-with-headers.py localhost:$HGPORT1 't/a?style=atom' 200 Script output follows @@ -800,7 +800,7 @@ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a/?style=atom' + $ get-with-headers.py localhost:$HGPORT1 't/a/?style=atom' 200 Script output follows @@ -857,14 +857,14 @@ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't/a/file/tip/a?style=raw' 200 Script output follows a Test [paths] '*' extension - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows @@ -875,14 +875,14 @@ /coll/notrepo/e/ /coll/notrepo/f/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a Test [paths] '**' extension - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows @@ -896,14 +896,14 @@ /rcoll/notrepo/f/ /rcoll/notrepo/f/f2/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d Test collapse = True - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat >> paths.conf < [web] > collapse=true @@ -912,7 +912,7 @@ $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-3.log $ cat hg.pid >> $DAEMON_PIDS - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows @@ -922,11 +922,11 @@ /coll/c/ /coll/notrepo/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows @@ -937,7 +937,7 @@ /rcoll/c/ /rcoll/notrepo/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d @@ -952,7 +952,7 @@ > hidden = True > EOF - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/?style=raw' 200 Script output follows @@ -963,7 +963,7 @@ Subrepo parent not hidden $ mv $root/notrepo/f/.hg/hgrc.bak $root/notrepo/f/.hg/hgrc - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/?style=raw' 200 Script output follows @@ -975,28 +975,28 @@ Test repositories inside intermediate directories - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' 200 Script output follows e Test subrepositories inside intermediate directories - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' 200 Script output follows f2 Test descend = False - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat >> paths.conf < descend=false > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-4.log $ cat hg.pid >> $DAEMON_PIDS - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows @@ -1004,11 +1004,11 @@ /coll/b/ /coll/c/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows @@ -1016,14 +1016,14 @@ /rcoll/b/ /rcoll/c/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d Test intermediate directories - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/?style=raw' 200 Script output follows @@ -1033,14 +1033,14 @@ Test repositories inside intermediate directories - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' 200 Script output follows e Test subrepositories inside intermediate directories - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' + $ get-with-headers.py localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' 200 Script output follows f2 @@ -1050,7 +1050,7 @@ $ hg id http://localhost:$HGPORT1/astar 8580ff50825a - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat > paths.conf < [paths] > t/a = $root/a @@ -1060,7 +1060,7 @@ $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-5.log $ cat hg.pid >> $DAEMON_PIDS - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' + $ get-with-headers.py localhost:$HGPORT1 '?style=raw' 200 Script output follows @@ -1068,7 +1068,7 @@ /t/b/ /c/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't/?style=raw' 200 Script output follows @@ -1078,7 +1078,7 @@ Test collapse = True - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat >> paths.conf < [web] > collapse=true @@ -1086,14 +1086,14 @@ $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-6.log $ cat hg.pid >> $DAEMON_PIDS - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' + $ get-with-headers.py localhost:$HGPORT1 '?style=raw' 200 Script output follows /t/ /c/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't/?style=raw' 200 Script output follows @@ -1103,27 +1103,27 @@ test descend = False - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat >> paths.conf < descend=false > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-7.log $ cat hg.pid >> $DAEMON_PIDS - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' + $ get-with-headers.py localhost:$HGPORT1 '?style=raw' 200 Script output follows /c/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' + $ get-with-headers.py localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ /t/b/ - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ cat > paths.conf < [paths] > nostore = $root/nostore @@ -1135,7 +1135,7 @@ test inexistent and inaccessible repo should be ignored silently - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '' + $ get-with-headers.py localhost:$HGPORT1 '' 200 Script output follows @@ -1192,7 +1192,7 @@ collections: should succeed - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '?style=raw' + $ get-with-headers.py localhost:$HGPORT2 '?style=raw' 200 Script output follows @@ -1203,31 +1203,31 @@ /notrepo/e/ /notrepo/f/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/file/tip/a?style=raw' + $ get-with-headers.py localhost:$HGPORT2 'a/file/tip/a?style=raw' 200 Script output follows a - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'b/file/tip/b?style=raw' + $ get-with-headers.py localhost:$HGPORT2 'b/file/tip/b?style=raw' 200 Script output follows b - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'c/file/tip/c?style=raw' + $ get-with-headers.py localhost:$HGPORT2 'c/file/tip/c?style=raw' 200 Script output follows c atom-log with basedir / - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/atom-log' | grep ' rss-log with basedir / - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep 'http://hg.example.com:8080/a/rev/8580ff50825a - $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS + $ killdaemons.py $DAEMON_PIDS $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \ > --pid-file=hg.pid --webdir-conf collections.conf \ > -A access-collections-2.log -E error-collections-2.log @@ -1235,14 +1235,14 @@ atom-log with basedir /foo/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/atom-log' | grep ' rss-log with basedir /foo/ - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep 'http://hg.example.com:8080/foo/a/rev/8580ff50825a paths errors 1