Merge branch 'zk/clean-report-failure'

diff --git a/git-remote-testpy.py b/git-remote-testpy.py
index e4533b187d024fa5f044ecbbca8c05455a6662e2..d94a66a87094436efcb6cf8dd0171b0683f0376c 100644 (file)
--- a/git-remote-testpy.py
+++ b/git-remote-testpy.py
@@ -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):
     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)