Mercurial > hg
diff tests/test-bundle2-exchange.t @ 28549:e01bd7385f4f
tests: reorder hg serve commands
chg currently does not support hg serve -d. It has a quick path testing if the
command is hg serve -d and fallbacks to hg if so. But the test only works if
"serve" is the first argument since the test wants to avoid false positives
(for example, "-r serve" is different).
This patch reorders "hg server" commands in tests, making them chg friendly.
author | Jun Wu <quark@fb.com> |
---|---|
date | Tue, 15 Mar 2016 09:51:54 +0000 |
parents | d6d3cf5fda6f |
children | 622782ea9cf3 b8f9cdca8807 |
line wrap: on
line diff
--- a/tests/test-bundle2-exchange.t Sun Feb 14 01:06:12 2016 +0900 +++ b/tests/test-bundle2-exchange.t Tue Mar 15 09:51:54 2016 +0000 @@ -301,7 +301,7 @@ pull over http - $ hg -R main serve -p $HGPORT -d --pid-file=main.pid -E main-error.log + $ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log $ cat main.pid >> $DAEMON_PIDS $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc @@ -372,7 +372,7 @@ push over http - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS $ hg -R main phase --public 32af7686d403 @@ -498,7 +498,7 @@ > EOF $ killdaemons.py - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS Doing the actual push: Abort error @@ -596,7 +596,7 @@ > EOF $ killdaemons.py - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS $ hg -R main push other -r e7ec4e813ba6 @@ -661,7 +661,7 @@ > pretxnchangegroup = sh -c "echo 'Fail early!'; false" > EOF $ killdaemons.py # reload http config - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS $ hg -R main push other -r e7ec4e813ba6 @@ -785,7 +785,7 @@ > mandatorypart=$TESTTMP/mandatorypart.py > EOF $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS (Failure from a hook) @@ -857,7 +857,7 @@ > prepushkey.failpush = > EOF $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config - $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log + $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS $ hg -R main push other -r e7ec4e813ba6