Patchwork [1,of,3] tests: put test-treemanifest.t on a port diet

login
register
mail settings
Submitter timeless@mozdev.org
Date Feb. 17, 2016, 7:43 p.m.
Message ID <7db2ab69bf18b79ba1df.1455738188@waste.org>
Download mbox | patch
Permalink /patch/13247/
State Accepted
Headers show

Comments

timeless@mozdev.org - Feb. 17, 2016, 7:43 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1455737641 0
#      Wed Feb 17 19:34:01 2016 +0000
# Node ID 7db2ab69bf18b79ba1df9d2b350720de3373a043
# Parent  a036e1ae1fbe88ab99cb861ebfc2e4da7a3912ca
tests: put test-treemanifest.t on a port diet

test-treemanifest.t had introduced HGPORT3 and HGPORT4,
which were improperly added to run-tests.py.

It also was not using HGPORT1.
This recycles HGPORT, and shifts everything into HGPORT1 + HGPORT2.
timeless - Feb. 17, 2016, 8:16 p.m.
On Wed, Feb 17, 2016 at 2:43 PM, timeless <timeless@mozdev.org> wrote:
> @@ -465,14 +467,17 @@
>    $ echo troz >> b/bar/orange/fly/gnat.py
>    $ hg ci -m troz
>
> +Finish first server
> +  $ killdaemons.py
> +
>  Test cloning a treemanifest repo over http.
> -  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
> +  $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>    $ cd ..

For someone merging, this hunk is tied to the "Test cloning" line, and
not to the "hg ci -m troz" line -- it will look like tihs:
@@ -498,14 +500,17 @@
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache

+Finish first server
+  $ killdaemons.py
+
 Test cloning a treemanifest repo over http.
-  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
+  $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
When you resolve the conflict which added some verify stuff.
Yuya Nishihara - Feb. 20, 2016, 7:40 a.m.
On Wed, 17 Feb 2016 13:43:08 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1455737641 0
> #      Wed Feb 17 19:34:01 2016 +0000
> # Node ID 7db2ab69bf18b79ba1df9d2b350720de3373a043
> # Parent  a036e1ae1fbe88ab99cb861ebfc2e4da7a3912ca
> tests: put test-treemanifest.t on a port diet

Nice, pushed to the clowncopter, thanks.

Patch

diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -1,3 +1,5 @@ 
+#require killdaemons
+
   $ cat << EOF >> $HGRCPATH
   > [format]
   > usegeneraldelta=yes
@@ -465,14 +467,17 @@ 
   $ echo troz >> b/bar/orange/fly/gnat.py
   $ hg ci -m troz
 
+Finish first server
+  $ killdaemons.py
+
 Test cloning a treemanifest repo over http.
-  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
+  $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 We can clone even with the knob turned off and we'll get a treemanifest repo.
   $ hg clone --config experimental.treemanifest=False \
   >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT2 deepclone
+  >   http://localhost:$HGPORT deepclone
   requesting all changes
   adding changesets
   adding manifests
@@ -517,7 +522,7 @@ 
 Create clones using old repo formats to use in later tests
   $ hg clone --config format.usestore=False \
   >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT2 deeprepo-basicstore
+  >   http://localhost:$HGPORT deeprepo-basicstore
   requesting all changes
   adding changesets
   adding manifests
@@ -528,12 +533,12 @@ 
   $ cd deeprepo-basicstore
   $ grep store .hg/requires
   [1]
-  $ hg serve -p $HGPORT3 -d --pid-file=hg.pid --errorlog=errors.log
+  $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone --config format.usefncache=False \
   >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT2 deeprepo-encodedstore
+  >   http://localhost:$HGPORT deeprepo-encodedstore
   requesting all changes
   adding changesets
   adding manifests
@@ -544,7 +549,7 @@ 
   $ cd deeprepo-encodedstore
   $ grep fncache .hg/requires
   [1]
-  $ hg serve -p $HGPORT4 -d --pid-file=hg.pid --errorlog=errors.log
+  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
@@ -577,7 +582,7 @@ 
 
 Stream clone with basicstore
   $ hg clone --config experimental.changegroup3=True --uncompressed -U \
-  >   http://localhost:$HGPORT3 stream-clone-basicstore
+  >   http://localhost:$HGPORT1 stream-clone-basicstore
   streaming all changes
   18 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
@@ -592,7 +597,7 @@ 
 
 Stream clone with encodedstore
   $ hg clone --config experimental.changegroup3=True --uncompressed -U \
-  >   http://localhost:$HGPORT4 stream-clone-encodedstore
+  >   http://localhost:$HGPORT2 stream-clone-encodedstore
   streaming all changes
   18 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
@@ -607,7 +612,7 @@ 
 
 Stream clone with fncachestore
   $ hg clone --config experimental.changegroup3=True --uncompressed -U \
-  >   http://localhost:$HGPORT2 stream-clone-fncachestore
+  >   http://localhost:$HGPORT stream-clone-fncachestore
   streaming all changes
   18 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)