# HG changeset patch # User Pierre-Yves David # Date 1489109637 28800 # Node ID 1885c7d78bf62006c0403a6448bb531f3ed0ee00 # Parent c0a685c67c5c75bcc0fc878f4345803415d923ca server only: test a more standard method of disabling exchange We have an "official" config option from core so lets just use it. diff -r c0a685c67c5c -r 1885c7d78bf6 tests/test-evolve-serveronly-bundle2.t --- a/tests/test-evolve-serveronly-bundle2.t Thu Mar 09 12:47:31 2017 -0800 +++ b/tests/test-evolve-serveronly-bundle2.t Thu Mar 09 17:33:57 2017 -0800 @@ -147,8 +147,8 @@ $ curl -s http://localhost:$HGPORT/?cmd=capabilities _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch * (no-eol) (glob) - $ echo '[__temporary__]' >> server/.hg/hgrc - $ echo 'advertiseobsolete=False' >> server/.hg/hgrc + $ echo '[experimental]' >> server/.hg/hgrc + $ echo 'evolution=!' >> server/.hg/hgrc $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS @@ -158,7 +158,7 @@ namespaces phases - $ echo 'advertiseobsolete=True' >> server/.hg/hgrc + $ echo 'evolution=all' >> server/.hg/hgrc $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS diff -r c0a685c67c5c -r 1885c7d78bf6 tests/test-evolve-serveronly.t --- a/tests/test-evolve-serveronly.t Thu Mar 09 12:47:31 2017 -0800 +++ b/tests/test-evolve-serveronly.t Thu Mar 09 17:33:57 2017 -0800 @@ -163,8 +163,8 @@ $ curl -s http://localhost:$HGPORT/?cmd=capabilities _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch * (no-eol) (glob) - $ echo '[__temporary__]' >> server/.hg/hgrc - $ echo 'advertiseobsolete=False' >> server/.hg/hgrc + $ echo '[experimental]' >> server/.hg/hgrc + $ echo 'evolution=!' >> server/.hg/hgrc $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS @@ -178,7 +178,7 @@ $ curl -s http://localhost:$HGPORT/?cmd=capabilities | grep _evoext_pushobsmarkers_0 [1] - $ echo 'advertiseobsolete=True' >> server/.hg/hgrc + $ echo 'evolution=' >> server/.hg/hgrc $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS