Skip to content

Commit

Permalink
t1100-*.sh: Fix an intermittent test failure
Browse files Browse the repository at this point in the history
In particular, the final test ('flags and then non flags') fails
intermittently, depending on how much time elapsed between the
invocations of "git commit-tree" when creating the commits which
later have their commit id's compared. For example, if the commits
for childid-3 and childid-4 are created 1 or more seconds apart,
then the commits, which would otherwise be identical, will have
different commit id's.

In order to make the test reproducible, we remove the variability
by setting the author and committer times to a well defined state.
We accomplish this with a single call to 'test_tick' at the start
of the test.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ramsay Jones authored and Junio C Hamano committed Jul 30, 2012
1 parent 07a71b8 commit 425b8a2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions t/t1100-commit-tree-options.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ test_expect_success \


test_expect_success 'flags and then non flags' '
test_tick &&
echo comment text |
git commit-tree $(cat treeid) >commitid &&
echo comment text |
Expand Down

0 comments on commit 425b8a2

Please sign in to comment.