Browse Source

Merge branch 'fc/remote-testgit-feature-done'

In the longer term, tightening rules is a good thing to do, and
because nobody who has worked in the remote helper area seems to be
interested in reviewing this, I would assume they do not think
such a retroactive tightening will affect their remote helpers.  So
let's advance this topic to see what happens.

* fc/remote-testgit-feature-done:
  remote-testgit: properly check for errors
maint
Junio C Hamano 12 years ago
parent
commit
6f3f710127
  1. 8
      git-remote-testpy.py
  2. 21
      t/t5800-remote-testpy.sh

8
git-remote-testpy.py

@ -164,6 +164,11 @@ def do_import(repo, args): @@ -164,6 +164,11 @@ def do_import(repo, args):
ref = line[7:].strip()
refs.append(ref)

print "feature done"

if os.environ.get("GIT_REMOTE_TESTGIT_FAILURE"):
die('Told to fail')

repo = update_local_repo(repo)
repo.exporter.export_repo(repo.gitdir, refs)

@ -177,6 +182,9 @@ def do_export(repo, args): @@ -177,6 +182,9 @@ def do_export(repo, args):
if not repo.gitdir:
die("Need gitdir to export")

if os.environ.get("GIT_REMOTE_TESTGIT_FAILURE"):
die('Told to fail')

update_local_repo(repo)
changed = repo.importer.do_import(repo.gitdir)


21
t/t5800-remote-testpy.sh

@ -145,4 +145,25 @@ test_expect_failure 'push new branch with old:new refspec' ' @@ -145,4 +145,25 @@ test_expect_failure 'push new branch with old:new refspec' '
compare_refs clone HEAD server refs/heads/new-refspec
'

test_expect_success 'proper failure checks for fetching' '
(GIT_REMOTE_TESTGIT_FAILURE=1 &&
export GIT_REMOTE_TESTGIT_FAILURE &&
cd localclone &&
test_must_fail git fetch 2>&1 | \
grep "Error while running fast-import"
)
'

# We sleep to give fast-export a chance to catch the SIGPIPE
test_expect_failure 'proper failure checks for pushing' '
(GIT_REMOTE_TESTGIT_FAILURE=1 &&
export GIT_REMOTE_TESTGIT_FAILURE &&
GIT_REMOTE_TESTGIT_SLEEPY=1 &&
export GIT_REMOTE_TESTGIT_SLEEPY &&
cd localclone &&
test_must_fail git push --all 2>&1 | \
grep "Error while running fast-export"
)
'

test_done

Loading…
Cancel
Save