Patchwork [2,of,2,evolve-ext] tests: update tests for changes in upstream 24f556

login
register
mail settings
Submitter Durham Goode
Date May 16, 2017, 5:40 p.m.
Message ID <8e1fc84b9dcf1e356d50.1494956447@dev111.prn1.facebook.com>
Download mbox | patch
Permalink /patch/20640/
State Superseded
Headers show

Comments

Durham Goode - May 16, 2017, 5:40 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1494956324 25200
#      Tue May 16 10:38:44 2017 -0700
# Node ID 8e1fc84b9dcf1e356d50db4d8196c47aedb045f4
# Parent  745facc836f8cbdb4c2b9209f1a6bdb31446f144
tests: update tests for changes in upstream 24f556

Upstream commit 24f55686a63d029 changed how cache warming works, which
apparently affects the output of these tests.
Pierre-Yves David - May 17, 2017, 3:10 p.m.
On 05/16/2017 07:40 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1494956324 25200
> #      Tue May 16 10:38:44 2017 -0700
> # Node ID 8e1fc84b9dcf1e356d50db4d8196c47aedb045f4
> # Parent  745facc836f8cbdb4c2b9209f1a6bdb31446f144
> tests: update tests for changes in upstream 24f556
>
> Upstream commit 24f55686a63d029 changed how cache warming works, which
> apparently affects the output of these tests.

After some digging, we found a (in-mem) cache invalidation issue in core 
itself. Fix for core sent.

>
> diff --git a/tests/test-evolve-serveronly-bundle2.t b/tests/test-evolve-serveronly-bundle2.t
> --- a/tests/test-evolve-serveronly-bundle2.t
> +++ b/tests/test-evolve-serveronly-bundle2.t
> @@ -127,7 +127,7 @@ Pull
>    adding file changes
>    added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
>    2 new obsolescence markers
> -  (run 'hg heads' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads)
>    $ cat ../errors.log
>    $ hg -R ../other pull
>    pulling from http://localhost:$HGPORT/
> diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
> --- a/tests/test-obsolete.t
> +++ b/tests/test-obsolete.t
> @@ -276,7 +276,7 @@ Pushing again does not advertise extinct
>    adding file changes
>    added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
>    1 new obsolescence markers
> -  (run 'hg heads .' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads, 'hg merge' to merge)
>    $ qlog -R ../other-new
>    6
>    - 909a0fb57e5d
> @@ -366,7 +366,7 @@ Test rollback support
>    adding file changes
>    added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
>    1 new obsolescence markers
> -  (run 'hg heads .' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads, 'hg merge' to merge)
>
>    $ hg up -q 7 # to check rollback update behavior
>    $ qlog
> diff --git a/tests/test-wireproto-bundle1.t b/tests/test-wireproto-bundle1.t
> --- a/tests/test-wireproto-bundle1.t
> +++ b/tests/test-wireproto-bundle1.t
> @@ -87,7 +87,7 @@ Pull
>    adding file changes
>    added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
>    2 new obsolescence markers
> -  (run 'hg heads' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads)
>    $ hg -R ../other pull
>    pulling from ssh://user@dummy/server
>    searching for changes
> diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
> --- a/tests/test-wireproto.t
> +++ b/tests/test-wireproto.t
> @@ -92,7 +92,7 @@ Pull
>    added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
>    obsmarker-exchange: 139 bytes received
>    2 new obsolescence markers
> -  (run 'hg heads' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads)
>    $ hg -R ../other pull
>    pulling from ssh://user@dummy/server
>    searching for changes
> @@ -147,6 +147,6 @@ some common hidden
>    added 1 changesets with 0 changes to 1 files (+1 heads)
>    obsmarker-exchange: 208 bytes received
>    1 new obsolescence markers
> -  (run 'hg heads' to see heads, 'hg merge' to merge)
> +  (run 'hg heads' to see heads)
>
>    $ cd ..
>

Patch

diff --git a/tests/test-evolve-serveronly-bundle2.t b/tests/test-evolve-serveronly-bundle2.t
--- a/tests/test-evolve-serveronly-bundle2.t
+++ b/tests/test-evolve-serveronly-bundle2.t
@@ -127,7 +127,7 @@  Pull
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull
   pulling from http://localhost:$HGPORT/
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -276,7 +276,7 @@  Pushing again does not advertise extinct
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -366,7 +366,7 @@  Test rollback support
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog
diff --git a/tests/test-wireproto-bundle1.t b/tests/test-wireproto-bundle1.t
--- a/tests/test-wireproto-bundle1.t
+++ b/tests/test-wireproto-bundle1.t
@@ -87,7 +87,7 @@  Pull
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -92,7 +92,7 @@  Pull
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   obsmarker-exchange: 139 bytes received
   2 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
@@ -147,6 +147,6 @@  some common hidden
   added 1 changesets with 0 changes to 1 files (+1 heads)
   obsmarker-exchange: 208 bytes received
   1 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads)
 
   $ cd ..