Patchwork D9766: tests: wider work around matching in test-narrow-shallow.t

login
register
mail settings
Submitter phabricator
Date Jan. 14, 2021, 5:54 a.m.
Message ID <differential-rev-PHID-DREV-kadxus4tqm4hqhv7fpfk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48077/
State Superseded
Headers show

Comments

phabricator - Jan. 14, 2021, 5:54 a.m.
marmoute created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Since issue6150 is still not fixed, we have to accommodate a larger array of
  possible results. Otherwise we get frequent flakiness of local and CI runs.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9766

AFFECTED FILES
  tests/test-narrow-shallow.t

CHANGE DETAILS




To: marmoute, durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-narrow-shallow.t b/tests/test-narrow-shallow.t
--- a/tests/test-narrow-shallow.t
+++ b/tests/test-narrow-shallow.t
@@ -107,6 +107,12 @@ 
   merging d2/f6 (?)
   merging d2/f7 (?)
   3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?)
+  4 files updated, 6 files merged, 0 files removed, 0 files unresolved (?)
+  5 files updated, 5 files merged, 0 files removed, 0 files unresolved (?)
+  6 files updated, 4 files merged, 0 files removed, 0 files unresolved (?)
+  7 files updated, 3 files merged, 0 files removed, 0 files unresolved (?)
+  8 files updated, 2 files merged, 0 files removed, 0 files unresolved (?)
+  9 files updated, 1 files merged, 0 files removed, 0 files unresolved (?)
   10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?)
   $ cat d2/f7 d2/f8
   d2/f7 rev3