Patchwork [7,of,9] tests: use 'legacy.exchange' option in various mixed tests

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 3, 2016, 2:54 p.m.
Message ID <8bec28ff9108b74d798e.1470236092@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16063/
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 1470231595 -7200
#      Wed Aug 03 15:39:55 2016 +0200
# Node ID 8bec28ff9108b74d798e93ec51b7f44ce6614bc4
# Parent  2aa42c8c4f4732dafde3f1e0ad30920c94f75ad4
# EXP-Topic bundle2.devel
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.

Patch

diff -r 2aa42c8c4f47 -r 8bec28ff9108 tests/test-bookmarks-pushpull.t
--- 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 @@  Using ssh
   $ 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 @@  Using http
   $ 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
diff -r 2aa42c8c4f47 -r 8bec28ff9108 tests/test-phases-exchange.t
--- 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 @@  same over the wire
 
 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
diff -r 2aa42c8c4f47 -r 8bec28ff9108 tests/test-pull-http.t
--- 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 @@  expect error, cloning not allowed
   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
diff -r 2aa42c8c4f47 -r 8bec28ff9108 tests/test-push-hook-lock.t
--- 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
diff -r 2aa42c8c4f47 -r 8bec28ff9108 tests/test-subrepo.t
--- 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 @@  Courtesy phases synchronisation to publi
   > [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