diff --git a/tests/test-journal-exists.out b/tests/test-journal-exists.out deleted file mode 100644 --- a/tests/test-journal-exists.out +++ /dev/null @@ -1,11 +0,0 @@ -adding a -abort: abandoned transaction found - run hg recover! -rolling back interrupted transaction -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 1 changesets, 1 total revisions -% check that zero-size journals are correctly aborted -adding changesets -abort: Permission denied diff --git a/tests/test-journal-exists b/tests/test-journal-exists.t old mode 100755 new mode 100644 rename from tests/test-journal-exists rename to tests/test-journal-exists.t --- a/tests/test-journal-exists +++ b/tests/test-journal-exists.t @@ -1,20 +1,34 @@ -#!/bin/sh + $ hg init + $ echo a > a + $ hg ci -Am0 + adding a -hg init -echo a > a -hg ci -Am0 -hg -q clone . foo + $ hg -q clone . foo + + $ touch .hg/store/journal -touch .hg/store/journal + $ echo foo > a + $ hg ci -Am0 + abort: abandoned transaction found - run hg recover! -echo foo > a -hg ci -Am0 + $ hg recover + rolling back interrupted transaction + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 1 changesets, 1 total revisions -hg recover +Check that zero-size journals are correctly aborted: -echo % check that zero-size journals are correctly aborted -hg bundle -qa repo.hg -chmod -w foo/.hg/store/00changelog.i -hg -R foo unbundle repo.hg 2>&1 | sed 's/\(abort: Permission denied\).*/\1/' -if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi -exit 0 + $ hg bundle -qa repo.hg + $ chmod -w foo/.hg/store/00changelog.i + + $ hg -R foo unbundle repo.hg + adding changesets + abort: Permission denied: .* + + $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi + + $ exit 0 +