changeset 15075:77325c92db95 stable

keyword: make status test after record and kwexpand/kwshrink reliable This guarantees test failure when the dirstate code is omitted at the end of the kwtemplater.overwrite method. kwexpand/kwshrink: Without a 1 second wait the test succeeds sometimes, even when the dirstate of the overwritten file is not forced to normal. record: status after recording an added file allows to check whether normallookup is needed after overwriting.
author Christian Ebert <blacktrash@gmx.net>
date Sat, 10 Sep 2011 13:23:41 +0100
parents 64fbd0de9773
children 02734d2baa79
files tests/test-keyword.t
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-keyword.t	Sat Sep 10 17:49:19 2011 -0500
+++ b/tests/test-keyword.t	Sat Sep 10 13:23:41 2011 +0100
@@ -444,6 +444,8 @@
   r
   committed changeset 3:899491280810
   overwriting r expanding keywords
+ - status call required for dirstate.normallookup() check
+  $ hg status r
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
@@ -834,6 +836,8 @@
   $ hg copy a x/a
   $ hg --verbose kwshrink a
   overwriting a shrinking keywords
+ - sleep required for dirstate.normal() check
+  $ sleep 1
   $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords