1898487 - configwizard: fix test-evolve.t failures

Status: RESOLVED FIXED

(Developer Services :: Mercurial: configwizard, task)

Comment 1

[Julien Cristau [:jcristau] (back August 18)]

Attachment: configwizard: don't update twice when we clone evolve (bug 1898487). r?sheehan

changeset a88e3049ab62 (Bug 1689647 - Update to evolve's latest tag
rather than tip of stable branch) added a call to hg update right
after hg clone. Passing --noupdate to clone means we don't
unnecessarily update twice.

This fixes a test failure:

--- /app/vct/hgext/configwizard/tests/test-evolve.t
+++ /app/vct/hgext/configwizard/tests/test-evolve.t.err
@@ -98,6 +98,7 @@
   new changesets *:* (glob) (?)
   updating to branch stable
   \d+ files updated, \d+ files merged, \d+ files removed, \d+ files unresolved (re)
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   Evolve was downloaded successfully.
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y

Comment 2

[Julien Cristau [:jcristau] (back August 18)]

Attachment: configwizard: update test expectation for change in mercurial 6.1 (bug 1898487). r?sheehan

https://repo.mercurial-scm.org/hg/rev/e4acdf5d94a2 added extra quotes.

Comment 3

[Julien Cristau [:jcristau] (back August 18)]

Attachment: configwizard: update test-evolve expectation for @ bookmark (bug 1898487). r?sheehan

https://repo.mercurial-scm.org/evolve/rev/@ hasn't moved in a couple of
years, so stripping the topmost changeset and pulling it back no longer
updates the bookmark.

Comment 4

[Julien Cristau [:jcristau] (back August 18)]

Attachment: configwizard: update test-evolve expectations for obsolescence-related output (bug 1898487). r?sheehan

• pulling can result in new markers
• strip complains if markers are present but evolve isn't enabled

--- /app/vct/hgext/configwizard/tests/test-evolve.t
+++ /app/vct/hgext/configwizard/tests/test-evolve.t.err
@@ -124,6 +124,7 @@
   > EOF
   pulling from https://repo.mercurial-scm.org/evolve/
   no changes found
+  314 new obsolescence markers
   \d+ files updated, \d+ files merged, \d+ files removed, \d+ files unresolved (re)
   Evolve was updated successfully.
   This wizard will guide you through configuring Mercurial for an optimal
@@ -139,6 +140,7 @@
 Before doing so, strip a revision off the evolve directory to ensure a change is pulled.

   $ hg -R $EVOLVETMP/evolve --config extensions.strip= strip .
+  obsolete feature not enabled but 314 markers found!
   \d+ files updated, \d+ files merged, \d+ files removed, \d+ files unresolved (re)
   saved backup bundle to * (glob)


ERROR: test-evolve.t output changed

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/dde7db6c1f26
configwizard: don't update twice when we clone evolve . r=sheehan
https://hg.mozilla.org/hgcustom/version-control-tools/rev/33674fd467d3
configwizard: update test expectation for change in mercurial 6.1 . r=sheehan
https://hg.mozilla.org/hgcustom/version-control-tools/rev/3525a26608c5
configwizard: update test-evolve expectation for @ bookmark . r=sheehan
https://hg.mozilla.org/hgcustom/version-control-tools/rev/25b024d24b93
configwizard: update test-evolve expectations for obsolescence-related output . r=sheehan