Patchwork tests: make test-shelve.t timing-independent

login
register
mail settings
Submitter via Mercurial-devel
Date March 8, 2017, 10:30 p.m.
Message ID <66759ac6665d2fbde797.1489012249@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/19024/
State Accepted
Headers show

Comments

via Mercurial-devel - March 8, 2017, 10:30 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1489012165 28800
#      Wed Mar 08 14:29:25 2017 -0800
# Node ID 66759ac6665d2fbde79753e8739549613822f1e5
# Parent  150cd51257221fad5ccba5794e7a21837afba479
tests: make test-shelve.t timing-independent

It was sometimes taking 2s for me (not the "1s" the test expected).
Augie Fackler - March 8, 2017, 10:36 p.m.
On Wed, Mar 08, 2017 at 02:30:49PM -0800, Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1489012165 28800
> #      Wed Mar 08 14:29:25 2017 -0800
> # Node ID 66759ac6665d2fbde79753e8739549613822f1e5
> # Parent  150cd51257221fad5ccba5794e7a21837afba479
> tests: make test-shelve.t timing-independent

Queued, thanks.

Patch

diff -r 150cd5125722 -r 66759ac6665d tests/test-shelve.t
--- a/tests/test-shelve.t	Fri Mar 03 13:25:30 2017 -0500
+++ b/tests/test-shelve.t	Wed Mar 08 14:29:25 2017 -0800
@@ -1692,7 +1692,7 @@ 
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 3 >> file && hg ci -Am 13
   $ hg shelve --list
-  default         (1s ago)    changes to: 1
+  default         (*s ago)    changes to: 1 (glob)
   $ hg unshelve --keep
   unshelving change 'default'
   rebasing shelved changes