Patchwork [3,of,3] tests: remove initial bundle2 enabling in various bundle2 tests

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 2, 2016, 2:17 p.m.
Message ID <8cff67497dbdac6c38cd.1470147432@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16038/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 2, 2016, 2:17 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1470142446 -7200
#      Tue Aug 02 14:54:06 2016 +0200
# Node ID 8cff67497dbdac6c38cd9b8efa5861a2d95ebbfd
# Parent  b728750103008bb3441c9dbdd2d81a603209432d
# EXP-Topic bundle2.testcleanup
tests: remove initial bundle2 enabling in various bundle2 tests

Bundle 2 is enable by default since 3.6 so we don't need this anymore.

The remaining use of 'experimental.bundle2-exp' are there to test legacy behavior
with bundle 1. Future patches will introduce a way outside of experimental to
test that.

Patch

diff -r b72875010300 -r 8cff67497dbd tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t	Tue Aug 02 15:44:51 2016 +0200
+++ b/tests/test-bundle2-exchange.t	Tue Aug 02 14:54:06 2016 +0200
@@ -16,7 +16,6 @@  enable obsolescence
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution=createmarkers,exchange
-  > bundle2-exp=True
   > bundle2-output-capture=True
   > [ui]
   > ssh=python "$TESTDIR/dummyssh"
diff -r b72875010300 -r 8cff67497dbd tests/test-bundle2-format.t
--- a/tests/test-bundle2-format.t	Tue Aug 02 15:44:51 2016 +0200
+++ b/tests/test-bundle2-format.t	Tue Aug 02 14:54:06 2016 +0200
@@ -227,7 +227,6 @@  Create an extension to test bundle2 API
   > [extensions]
   > bundle2=$TESTTMP/bundle2.py
   > [experimental]
-  > bundle2-exp=True
   > evolution=createmarkers
   > [ui]
   > ssh=python "$TESTDIR/dummyssh"
diff -r b72875010300 -r 8cff67497dbd tests/test-bundle2-multiple-changegroups.t
--- a/tests/test-bundle2-multiple-changegroups.t	Tue Aug 02 15:44:51 2016 +0200
+++ b/tests/test-bundle2-multiple-changegroups.t	Tue Aug 02 14:54:06 2016 +0200
@@ -33,8 +33,6 @@  Create an extension to test bundle2 with
   > EOF
 
   $ cat >> $HGRCPATH << EOF
-  > [experimental]
-  > bundle2-exp=True
   > [ui]
   > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
   > EOF
diff -r b72875010300 -r 8cff67497dbd tests/test-bundle2-pushback.t
--- a/tests/test-bundle2-pushback.t	Tue Aug 02 15:44:51 2016 +0200
+++ b/tests/test-bundle2-pushback.t	Tue Aug 02 14:54:06 2016 +0200
@@ -50,8 +50,6 @@  Enable extension
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > bundle2=$TESTTMP/bundle2.py
-  > [experimental]
-  > bundle2-exp = True
   > EOF
 
 Without config
diff -r b72875010300 -r 8cff67497dbd tests/test-bundle2-remote-changegroup.t
--- a/tests/test-bundle2-remote-changegroup.t	Tue Aug 02 15:44:51 2016 +0200
+++ b/tests/test-bundle2-remote-changegroup.t	Tue Aug 02 14:54:06 2016 +0200
@@ -78,8 +78,6 @@  Start a simple HTTP server to serve bund
   $ cat dumb.pid >> $DAEMON_PIDS
 
   $ cat >> $HGRCPATH << EOF
-  > [experimental]
-  > bundle2-exp=True
   > [ui]
   > ssh=python "$TESTDIR/dummyssh"
   > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}