diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-31 15:39:24 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-31 15:39:24 +0100 |
commit | 9c1609b241c48748dad26cf14dcad2374e392b55 (patch) | |
tree | b0e47a7213abcdc6e59234f5b3e689a37088e98f | |
parent | 4a951edc804d8034151cbc65bbcac850c794391a (diff) | |
download | lorry-9c1609b241c48748dad26cf14dcad2374e392b55.tar.gz |
Fix test case after message changesliw/names-with-slashes
-rwxr-xr-x | tests/git-backup-on-error.script | 3 | ||||
-rw-r--r-- | tests/git-backup-on-error.stdout | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error.script index cbaa247..134367c 100755 --- a/tests/git-backup-on-error.script +++ b/tests/git-backup-on-error.script @@ -40,7 +40,8 @@ normalize() { # make upstream disappear to cause errors rm -rf "$repo" if ./lorry --pull-only --log="$logfile" --working-area="$workdir" \ - "$DATADIR/git-backup-test-repo.lorry" --bundle=never | normalize + "$DATADIR/git-backup-test-repo.lorry" --bundle=never 2>/dev/null | \ + normalize then echo Previous lorry command should have failed >&2 exit 1 diff --git a/tests/git-backup-on-error.stdout b/tests/git-backup-on-error.stdout index bdee3e0..195970e 100644 --- a/tests/git-backup-on-error.stdout +++ b/tests/git-backup-on-error.stdout @@ -1,8 +1,4 @@ Mirror of git-backup-test-repo failed, state before mirror is saved at DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME and state after mirror is saved at DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME -Exception: git fetch file://DATADIR/git-backup-test-repo +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/* failed (exit code 128): - fatal: 'DATADIR/git-backup-test-repo' does not appear to be a git repository - fatal: The remote end hung up unexpectedly - DATADIR/work-dir/git-backup-test-repo DATADIR/work-dir/git-backup-test-repo/git DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME |