mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/t5800-import-race-fix' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-05-07 13:13:55 -07:00
parent a28b919f05 7fb8e163bd
commit 1d9fd6683c
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-remote-testgit.py
View File

@ -22,6 +22,7 @@ except ImportError:
_digest = sha.new _digest = sha.new
import sys import sys
import os import os
import time
sys.path.insert(0, os.getenv("GITPYTHONLIB",".")) sys.path.insert(0, os.getenv("GITPYTHONLIB","."))
from git_remote_helpers.util import die, debug, warn from git_remote_helpers.util import die, debug, warn
@ -204,6 +205,11 @@ def read_one_line(repo):
"""Reads and processes one command. """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() line = sys.stdin.readline()
cmdline = line cmdline = line
@ -258,6 +264,7 @@ def main(args):
more = True more = True
sys.stdin = os.fdopen(sys.stdin.fileno(), 'r', 0)
while (more): while (more):
more = read_one_line(repo) more = read_one_line(repo)

13
t/t5800-remote-helpers.sh
View File

@ -72,6 +72,19 @@ test_expect_success 'pushing to local repo' '
compare_refs localclone HEAD server HEAD compare_refs localclone HEAD server HEAD
' '
# Generally, skip this test. It demonstrates a now-fixed race in
# git-remote-testgit, but is too slow to leave in for general use.
: test_expect_success 'racily pushing to local repo' '
test_when_finished "rm -rf server2 localclone2" &&
cp -a server server2 &&
git clone "testgit::${PWD}/server2" localclone2 &&
(cd localclone2 &&
echo content >>file &&
git commit -a -m three &&
GIT_REMOTE_TESTGIT_SLEEPY=2 git push) &&
compare_refs localclone2 HEAD server2 HEAD
'
test_expect_success 'synch with changes from localclone' ' test_expect_success 'synch with changes from localclone' '
(cd clone && (cd clone &&
git pull) git pull)