tests: use 'legacy.exchange' option in various bundle1 tests
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 03 Aug 2016 15:34:03 +0200
changeset 32604 6e375ba01b04dc358757a67b6372355d2c275947
parent 32603 06e642d7f76cd27a8fc9c8f12b067f0e01b8ef1e
child 32605 ac9b850791222c0b795f1a3d475ee24ae5eeed92
push id304
push usergszorc@mozilla.com
push dateFri, 05 Aug 2016 03:17:27 +0000
tests: use 'legacy.exchange' option in various bundle1 tests The new option will stay around. The experimental option was only meant to be temporary.
tests/test-http-bundle1.t
tests/test-push-http-bundle1.t
tests/test-ssh-bundle1.t
tests/test-unbundlehash.t
--- a/tests/test-http-bundle1.t
+++ b/tests/test-http-bundle1.t
@@ -1,17 +1,17 @@
 #require serve
 
 This test is a duplicate of 'test-http.t', feel free to factor out
 parts that are not bundle1/bundle2 specific.
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [devel]
   > # This test is dedicated to interaction through old bundle
-  > bundle2-exp = False
+  > legacy.exchange = bundle1
   > EOF
 
   $ hg init test
   $ cd test
   $ echo foo>foo
   $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
   $ echo foo>foo.d/foo
   $ echo bar>foo.d/bAr.hg.d/BaR
--- a/tests/test-push-http-bundle1.t
+++ b/tests/test-push-http-bundle1.t
@@ -1,18 +1,18 @@
 #require killdaemons
 
 This test checks behavior related to bundle1 that changed or is likely
 to change with bundle2. Feel free to factor out any part of the test
 which does not need to exist to keep bundle1 working.
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [devel]
   > # This test is dedicated to interaction through old bundle
-  > bundle2-exp = False
+  > legacy.exchange = bundle1
   > EOF
 
   $ hg init test
   $ cd test
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ cd ..
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -1,15 +1,15 @@
 This test is a duplicate of 'test-http.t' feel free to factor out
 parts that are not bundle1/bundle2 specific.
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [devel]
   > # This test is dedicated to interaction through old bundle
-  > bundle2-exp = False
+  > legacy.exchange = bundle1
   > [format] # temporary settings
   > usegeneraldelta=yes
   > EOF
 
 
 This test tries to exercise the ssh functionality with a dummy script
 
 creating 'remote' repo
--- a/tests/test-unbundlehash.t
+++ b/tests/test-unbundlehash.t
@@ -1,18 +1,18 @@
 #require killdaemons
 
 Test wire protocol unbundle with hashed heads (capability: unbundlehash)
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [devel]
   > # This tests is intended for bundle1 only.
   > # bundle2 carries the head information inside the bundle itself and
   > # always uses 'force' as the heads value.
-  > bundle2-exp = False
+  > legacy.exchange = bundle1
   > EOF
 
 Create a remote repository.
 
   $ hg init remote
   $ hg serve -R remote --config web.push_ssl=False --config web.allow_push=* -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
   $ cat hg1.pid >> $DAEMON_PIDS