This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12381

tests: fix glob pattern for dynamic timer alignment
ClosedPublic

Authored by pacien on Thu, Mar 17, 6:04 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf64bbba2ee59: tests: fix glob pattern for dynamic timer alignment
Summary

The number of space characters varies depending on the number of digits of the
timer, making some tests fail on slow machines in an unintended way:

diff
--- /build/mercurial-6.1/tests/test-merge-halt.t
+++ /build/mercurial-6.1/tests/test-merge-halt.t.err
@@ -210,6 +210,6 @@
   merge halted after failed merge (see hg resolve)
   [240]
   $ hg shelve --list
-  default         (* ago)    changes to: foo (glob)
+  default         (11s ago)   changes to: foo
   $ hg unshelve --abort
   unshelve of 'default' aborted
ERROR: test-merge-halt.t output changed

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pacien created this revision.Thu, Mar 17, 6:04 AM
Alphare accepted this revision.Thu, Mar 17, 6:48 AM
This revision is now accepted and ready to land.Thu, Mar 17, 6:48 AM
pacien added a commit: rHGf64bbba2ee59: tests: fix glob pattern for dynamic timer alignment.Thu, Mar 17, 7:44 AM
Closed by commit rHGf64bbba2ee59: tests: fix glob pattern for dynamic timer alignment (authored by pacien). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-halt.t (2 lines)
Mtests/test-shelve.t (8 lines)

Diff 32656

tests/test-merge-halt.t

# To abort: hg unshelve --abort # To abort: hg unshelve --abort
$ hg resolve --tool false --all --re-merge $ hg resolve --tool false --all --re-merge
merging shelve_file1 merging shelve_file1
merging shelve_file1 failed! merging shelve_file1 failed!
merge halted after failed merge (see hg resolve) merge halted after failed merge (see hg resolve)
[240] [240]
$ hg shelve --list $ hg shelve --list
default (* ago) changes to: foo (glob) default (*s ago) * changes to: foo (glob)
$ hg unshelve --abort $ hg unshelve --abort
unshelve of 'default' aborted unshelve of 'default' aborted

tests/test-shelve.t

--- /dev/null --- /dev/null
+++ b/jungle +++ b/jungle
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+babar +babar
Test shelve --delete Test shelve --delete
$ hg shelve --list $ hg shelve --list
default (*s ago) changes to: create conflict (glob) default (*s ago) * changes to: create conflict (glob)
$ hg shelve --delete doesnotexist $ hg shelve --delete doesnotexist
abort: shelved change 'doesnotexist' not found abort: shelved change 'doesnotexist' not found
[10] [10]
$ hg shelve --delete default $ hg shelve --delete default
$ cd .. $ cd ..
Test visibility of in-memory changes inside transaction to external hook Test visibility of in-memory changes inside transaction to external hook
adding d adding d
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo > e $ echo > e
$ hg add e $ hg add e
$ hg ci -m e $ hg ci -m e
$ hg shelve --patch $ hg shelve --patch
default (*s ago) changes to: b (glob) default (*s ago) * changes to: b (glob)
diff --git a/c b/c diff --git a/c b/c
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/c +++ b/c
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ +
diff --git a/d b/d diff --git a/d b/d
$ ls -A $ ls -A
.hg .hg
b b
c c
e e
-- shelve should not contain `c` now -- shelve should not contain `c` now
$ hg shelve --patch $ hg shelve --patch
default (*s ago) changes to: b (glob) default (*s ago) * changes to: b (glob)
diff --git a/d b/d diff --git a/d b/d
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/d +++ b/d
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ +
$ hg unshelve -i <<EOF $ hg unshelve -i <<EOF
$ hg st $ hg st
M foo M foo
? garbage ? garbage
$ cat foo $ cat foo
A A
B B
$ hg shelve --patch $ hg shelve --patch
default (*s ago) changes to: add B to foo (glob) default (*s ago) * changes to: add B to foo (glob)
diff --git a/foo b/foo diff --git a/foo b/foo
--- a/foo --- a/foo
+++ b/foo +++ b/foo
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
A A
B B
+C +C