Patchwork D5568: tests: de-flake test-narrow-share.t by making dirstate predictable

login
register
mail settings
Submitter phabricator
Date Jan. 11, 2019, 12:53 p.m.
Message ID <5471f17599f77da5a85400e1a88a8463@localhost.localdomain>
Download mbox | patch
Permalink /patch/37668/
State Not Applicable
Headers show

Comments

phabricator - Jan. 11, 2019, 12:53 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3227923979a1: tests: de-flake test-narrow-share.t by making dirstate predictable (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5568?vs=13164&id=13167

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

AFFECTED FILES
  tests/test-narrow-share.t

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-narrow-share.t b/tests/test-narrow-share.t
--- a/tests/test-narrow-share.t
+++ b/tests/test-narrow-share.t
@@ -44,6 +44,14 @@ 
 
 Narrow the share and check that the main repo's working copy gets updated
 
+# Make sure the files that are supposed to be known-clean get their timestamps set in the dirstate
+  $ sleep 2
+  $ hg -R main st
+  $ hg -R main debugdirstate --no-dates
+  n 644          2 set                 d1/f
+  n 644          2 set                 d3/f
+  n 644          2 set                 d5/f
+  n 644          2 set                 d7/f
 # Make d3/f dirty
   $ echo x >> main/d3/f
   $ echo y >> main/d3/g
@@ -58,7 +66,7 @@ 
   A d3/g
   $ hg -R main debugdirstate --no-dates
   n 644          2 set                 d1/f
-  n 644          2 unset               d3/f
+  n 644          2 set                 d3/f
   a   0         -1 unset               d3/g
   n 644          2 set                 d5/f
   n 644          2 set                 d7/f