Patchwork [5,of,9] tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t'

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 3, 2016, 2:54 p.m.
Message ID <809167e8b2c317b61a6f.1470236090@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16060/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 3, 2016, 2:54 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1470144183 -7200
#      Tue Aug 02 15:23:03 2016 +0200
# Node ID 809167e8b2c317b61a6fcaee8c17b476b8a83106
# Parent  3b73d07b2179cfe49823b2a770dd2bad769e9401
# EXP-Topic bundle2.devel
tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t'

The new option will stay around. The experimental option was only meant to be
temporary.

Patch

diff -r 3b73d07b2179 -r 809167e8b2c3 tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t	Wed Aug 03 16:42:10 2016 +0200
+++ b/tests/test-bundle2-exchange.t	Tue Aug 02 15:23:03 2016 +0200
@@ -969,7 +969,7 @@  Servers can disable bundle1 for clone/pu
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT/ not-bundle2
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
   requesting all changes
   abort: remote error:
   incompatible Mercurial client; bundle2 required
@@ -992,7 +992,7 @@  bundle1 can still pull non-generaldelta 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT/ not-bundle2-1
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-1
   requesting all changes
   adding changesets
   adding manifests
@@ -1013,7 +1013,7 @@  bundle1 pull can be disabled for general
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT/ not-bundle2
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
   requesting all changes
   abort: remote error:
   incompatible Mercurial client; bundle2 required
@@ -1030,7 +1030,7 @@  Verify the global server.bundle1 option 
   > EOF
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT not-bundle2
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT not-bundle2
   requesting all changes
   abort: remote error:
   incompatible Mercurial client; bundle2 required
@@ -1045,7 +1045,7 @@  Verify the global server.bundle1 option 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT/ not-bundle2
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
   requesting all changes
   abort: remote error:
   incompatible Mercurial client; bundle2 required
@@ -1062,7 +1062,7 @@  Verify the global server.bundle1 option 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ hg --config experimental.bundle2-exp=false clone http://localhost:$HGPORT/ not-bundle2-2
+  $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-2
   requesting all changes
   adding changesets
   adding manifests
@@ -1099,7 +1099,7 @@  Verify bundle1 pushes can be disabled
   $ cd bundle2-only
   $ echo commit > foo
   $ hg commit -m commit
-  $ hg --config experimental.bundle2-exp=false push
+  $ hg --config devel.legacy.exchange=bundle1 push
   pushing to http://localhost:$HGPORT/
   searching for changes
   abort: remote error: