diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:56 -0700 |
| commit | 1d9fd6683c44b6e5f9f9990981de70c2a9f83433 (patch) | |
| tree | 75ac6c163cfee80afe25af01b3e643721d233c27 /git-remote-testgit.py | |
| parent | a28b919f05ed29cd9e6615179bd56edde50c6b63 (diff) | |
| parent | 7fb8e163bdfdc5ffb69b98f3f05ef0dbade4e677 (diff) | |
| download | git-1d9fd6683c44b6e5f9f9990981de70c2a9f83433.tar.gz | |
Merge branch 'pw/t5800-import-race-fix' into maint
The test scaffolding for fast-import was flaky.
By Pete Wyckoff
* pw/t5800-import-race-fix:
git-remote-testgit: fix race when spawning fast-import
Diffstat (limited to 'git-remote-testgit.py')
| -rw-r--r-- | git-remote-testgit.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-remote-testgit.py b/git-remote-testgit.py index 3dc4851cfc..5f3ebd244d 100644 --- a/git-remote-testgit.py +++ b/git-remote-testgit.py @@ -22,6 +22,7 @@ except ImportError: _digest = sha.new import sys import os +import time sys.path.insert(0, os.getenv("GITPYTHONLIB",".")) from git_remote_helpers.util import die, debug, warn @@ -204,6 +205,11 @@ def read_one_line(repo): """Reads and processes one command. """ + sleepy = os.environ.get("GIT_REMOTE_TESTGIT_SLEEPY") + if sleepy: + debug("Sleeping %d sec before readline" % int(sleepy)) + time.sleep(int(sleepy)) + line = sys.stdin.readline() cmdline = line @@ -258,6 +264,7 @@ def main(args): more = True + sys.stdin = os.fdopen(sys.stdin.fileno(), 'r', 0) while (more): more = read_one_line(repo) |