Patchwork [1,of,2,evolve-ext] tests: update tests to work with upstream 2b6692

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

Comments

Durham Goode - May 16, 2017, 5:40 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1494956340 25200
#      Tue May 16 10:39:00 2017 -0700
# Node ID 745facc836f8cbdb4c2b9209f1a6bdb31446f144
# Parent  2241433a77e543ee068039fa2fb9ad514decca93
tests: update tests to work with upstream 2b6692

Upstream commit 2b6692df1bdf changed when caches are processed, which results in
getid having debug output in test-obsolete.t. Let's manually call getid to force
the output before we try to use getid in the following command.
Pierre-Yves David - May 17, 2017, 2:50 p.m.
On 05/16/2017 07:40 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1494956340 25200
> #      Tue May 16 10:39:00 2017 -0700
> # Node ID 745facc836f8cbdb4c2b9209f1a6bdb31446f144
> # Parent  2241433a77e543ee068039fa2fb9ad514decca93
> tests: update tests to work with upstream 2b6692
>
> Upstream commit 2b6692df1bdf changed when caches are processed, which results in
> getid having debug output in test-obsolete.t. Let's manually call getid to force
> the output before we try to use getid in the following command.

The right fix there is to stop using `hg id --debug` in getid. Boris did 
so this morning so that should be fixed now.

https://www.mercurial-scm.org/repo/evolve/rev/2ddbdc1bab13

Patch

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -668,6 +668,10 @@  Check divergence detection (note: multip
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
   phases: 3 draft
   bumped: 1 changesets
+# Call getid to force get the cache output out of the way
+  $ getid a7a6f2b5d8a5
+  a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e
+  truncating cache/rbc-revs-v1 to 112
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'divergent()'
   changeset:   12:6db5e282cb91