# HG changeset patch # User Christian Ebert # Date 1333524707 -7200 # Node ID 3c257fefa53d4fb1e883a6fb1fff0f99b4203278 # Parent 2d2d93380694ccd98d4e1975769ce0387bb696cf# Parent 70b4494ccf1dc91c274d212f73d961a49351d3db Merge with stable diff -r 2d2d93380694 -r 3c257fefa53d tests/test-keyword.t --- a/tests/test-keyword.t Tue Apr 03 16:34:50 2012 +0100 +++ b/tests/test-keyword.t Wed Apr 04 09:31:47 2012 +0200 @@ -907,14 +907,14 @@ $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS - $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/file/tip/a/?style=raw' + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw' 200 Script output follows expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ - $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/annotate/tip/a/?style=raw' + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw' 200 Script output follows @@ -926,7 +926,7 @@ - $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/rev/tip/?style=raw' + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw' 200 Script output follows @@ -946,7 +946,7 @@ +xxx $ +$Xinfo$ - $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/diff/bb948857c743/a?style=raw' + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw' 200 Script output follows