git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: git@vger.kernel.org, krh@redhat.com, gitster@pobox.com
Subject: [PATCH 4/3] t3700: avoid racy git situation
Date: Thu, 8 Nov 2007 14:14:37 +0000 (GMT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0711081414160.4362@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0711081213580.4362@racer.site>


Wow, the builtin commit is fast.  It sometimes triggers a racy
situation in the test case for "git add --refresh -- foo".

So when that test fails, simply sleep one second and try again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t3700-add.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index a328bf5..f4950a3 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -152,7 +152,12 @@ test_expect_success 'git add --refresh' '
 	*) echo fail; (exit 1);;
 	esac &&
 	git add --refresh -- foo &&
-	test -z "`git diff-index HEAD -- foo`"
+	test -z "`git diff-index HEAD -- foo`" || {
+		echo Sleeping one second to avoid racy situation &&
+		sleep 1 &&
+		git add --refresh -- foo &&
+		test -z "`git diff-index HEAD -- foo`"
+	}
 '
 
 test_done
-- 
1.5.3.5.1634.g0fa78

  parent reply	other threads:[~2007-11-08 14:15 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-08 12:14 [PATCH 0/3] builtin-commit fixes Johannes Schindelin
2007-11-08 12:15 ` [PATCH 1/3] builtin-commit: fix reflog message generation Johannes Schindelin
2007-11-08 12:15 ` [PATCH 2/3] launch_editor(): read the file, even when EDITOR=: Johannes Schindelin
2007-11-08 12:33   ` Johannes Sixt
2007-11-08 14:06     ` [PATCH REPLACING " Johannes Schindelin
2007-11-08 12:16 ` [PATCH 3/3] builtin-commit: fix author date with --amend --author=<author> Johannes Schindelin
2007-11-08 14:14 ` Johannes Schindelin [this message]
2007-11-08 14:34   ` [PATCH 4/3] t3700: avoid racy git situation Johannes Sixt
2007-11-08 15:16     ` Johannes Schindelin
2007-11-08 15:27       ` Kristian Høgsberg
2007-11-08 15:45       ` Johannes Sixt
2007-11-08 20:42       ` Junio C Hamano
2007-11-09  3:00         ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0711081414160.4362@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=krh@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).