changeset 29687:ac9b85079122

tests: use 'legacy.exchange' option in various mixed tests The new option will stay around. The experimental option was only meant to be temporary. We update various tests that validate both bundle1 and bundle2 version side by side. This changeset only takes care of enforcing bundle1. The other use of 'experimental.bundle2-exp=True' will be taken care of in the next changeset.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 03 Aug 2016 15:39:55 +0200
parents 6e375ba01b04
children 30c59bdd4f41
files tests/test-bookmarks-pushpull.t tests/test-phases-exchange.t tests/test-pull-http.t tests/test-push-hook-lock.t tests/test-subrepo.t
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Wed Aug 03 15:34:03 2016 +0200
+++ b/tests/test-bookmarks-pushpull.t	Wed Aug 03 15:39:55 2016 +0200
@@ -832,7 +832,7 @@
   $ hg -R ../issue4455-dest/ bookmarks
   no bookmarks set
 
-  $ hg push -B @ ssh --config experimental.bundle2-exp=False
+  $ hg push -B @ ssh --config devel.legacy.exchange=bundle1
   pushing to ssh://user@dummy/issue4455-dest
   searching for changes
   no changes found
@@ -855,7 +855,7 @@
   $ hg -R ../issue4455-dest/ bookmarks
   no bookmarks set
 
-  $ hg push -B @ http --config experimental.bundle2-exp=False
+  $ hg push -B @ http --config devel.legacy.exchange=bundle1
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
--- a/tests/test-phases-exchange.t	Wed Aug 03 15:34:03 2016 +0200
+++ b/tests/test-phases-exchange.t	Wed Aug 03 15:39:55 2016 +0200
@@ -1050,7 +1050,7 @@
 
 enforce bundle1
 
-  $ hg pull http://localhost:$HGPORT/ --config experimental.bundle2-exp=False
+  $ hg pull http://localhost:$HGPORT/ --config devel.legacy.exchange=bundle1
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
--- a/tests/test-pull-http.t	Wed Aug 03 15:34:03 2016 +0200
+++ b/tests/test-pull-http.t	Wed Aug 03 15:39:55 2016 +0200
@@ -52,7 +52,7 @@
   requesting all changes
   abort: authorization failed
   [255]
-  $ hg clone http://localhost:$HGPORT/ test4 --config experimental.bundle2-exp=False
+  $ hg clone http://localhost:$HGPORT/ test4 --config devel.legacy.exchange=bundle1
   abort: authorization failed
   [255]
   $ killdaemons.py
--- a/tests/test-push-hook-lock.t	Wed Aug 03 15:34:03 2016 +0200
+++ b/tests/test-push-hook-lock.t	Wed Aug 03 15:39:55 2016 +0200
@@ -26,7 +26,7 @@
   $ echo bar >> 3/foo
   $ hg --cwd 3 ci -m bar
 
-  $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False
+  $ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1
   pushing to ../2
   searching for changes
   adding changesets
--- a/tests/test-subrepo.t	Wed Aug 03 15:34:03 2016 +0200
+++ b/tests/test-subrepo.t	Wed Aug 03 15:39:55 2016 +0200
@@ -1529,7 +1529,7 @@
   > [paths]
   > default=../issue3781-dest/
   > EOF
-  $ hg push --config experimental.bundle2-exp=False
+  $ hg push --config devel.legacy.exchange=bundle1
   pushing to $TESTTMP/issue3781-dest (glob)
   pushing subrepo s to $TESTTMP/issue3781-dest/s
   searching for changes