diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-30 09:05:29 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-30 09:10:29 +0000 |
| commit | 1ea25f3c923e0f68b71efeb93141b00869315ecc (patch) | |
| tree | 883381e9387d15b8e1750c351ce9b5447d0983bc /tests | |
| parent | 5819d57b6c14e885d46955a2f71bf071f1f1dfc1 (diff) | |
| download | lorry-1ea25f3c923e0f68b71efeb93141b00869315ecc.tar.gz | |
git-backup test: prevent bundling to reduce output
Changing from gitorious to gitano showed that it generates a bundle.
This causes the test to produce different output, so is deemed a
failure.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/git-backup-on-error.script | 4 | ||||
| -rw-r--r-- | tests/git-backup-on-error.stdout | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error.script index 866db65..cbaa247 100755 --- a/tests/git-backup-on-error.script +++ b/tests/git-backup-on-error.script @@ -34,13 +34,13 @@ normalize() { } # mirror some history -./lorry --pull-only --log="$logfile" --working-area="$workdir" \ +./lorry --pull-only --log="$logfile" --working-area="$workdir" --bundle=never \ "$DATADIR/git-backup-test-repo.lorry" | 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" | normalize + "$DATADIR/git-backup-test-repo.lorry" --bundle=never | 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 c68ad21..bdee3e0 100644 --- a/tests/git-backup-on-error.stdout +++ b/tests/git-backup-on-error.stdout @@ -11,7 +11,6 @@ DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/HEAD DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/branches DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/config DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/description -DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks/applypatch-msg.sample DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks/commit-msg.sample @@ -36,7 +35,6 @@ DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/HEAD DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/branches DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/config DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/description -DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks/applypatch-msg.sample DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks/commit-msg.sample @@ -60,7 +58,6 @@ DATADIR/work-dir/git-backup-test-repo/git/HEAD DATADIR/work-dir/git-backup-test-repo/git/branches DATADIR/work-dir/git-backup-test-repo/git/config DATADIR/work-dir/git-backup-test-repo/git/description -DATADIR/work-dir/git-backup-test-repo/git/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl DATADIR/work-dir/git-backup-test-repo/git/hooks DATADIR/work-dir/git-backup-test-repo/git/hooks/applypatch-msg.sample DATADIR/work-dir/git-backup-test-repo/git/hooks/commit-msg.sample |