tests: de-flake test-narrow-debugrebuilddirstate.t
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 26 Sep 2018 12:06:44 -0700
changeset 39871 01c0f01b562b
parent 39870 b399ff55ee6d
child 39872 733db72f0f54
tests: de-flake test-narrow-debugrebuilddirstate.t If the dirstate gets written much later (usually 1-2 s, depending on FS) than the working copy file (there's only one), then the `hg debugdirstate` command will include a timestamp. There's nothing wrong with that, so we should just allow it. Differential Revision: https://phab.mercurial-scm.org/D4758
tests/test-narrow-debugrebuilddirstate.t
--- a/tests/test-narrow-debugrebuilddirstate.t	Mon Sep 24 12:39:34 2018 -0700
+++ b/tests/test-narrow-debugrebuilddirstate.t	Wed Sep 26 12:06:44 2018 -0700
@@ -21,8 +21,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd copy
 
-  $ hg debugdirstate
-  n *         20 unset               foo/bar (glob)
+  $ hg debugdirstate --no-dates
+  n *         20 *               foo/bar (glob)
   $ mv .hg/dirstate .hg/old_dirstate
   $ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null
   $ hg debugdirstate