# HG changeset patch # User Christian Ebert # Date 1315657421 -3600 # Node ID 639bb4617c704de72f61591be8563361c79634a7 # Parent 0b32ba113ad24cb72a1fb5bcce44a9952151408e 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. diff -r 0b32ba113ad2 -r 639bb4617c70 tests/test-keyword.t --- a/tests/test-keyword.t Wed Sep 14 15:30:21 2011 +0100 +++ 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