# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1284138349 -7200
# Node ID b4d0d646b3f77349ecd2105b4a5bd694c2a1e368
# Parent  c55d69c5fb7724e197f3f658932bd617a49406b6
tests: unify test-journal-exists

diff -r c55d69c5fb77 -r b4d0d646b3f7 tests/test-journal-exists
--- a/tests/test-journal-exists	Fri Sep 10 17:59:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-hg init
-echo a > a
-hg ci -Am0
-hg -q clone . foo
-
-touch .hg/store/journal
-
-echo foo > a
-hg ci -Am0
-
-hg recover
-
-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
diff -r c55d69c5fb77 -r b4d0d646b3f7 tests/test-journal-exists.out
--- a/tests/test-journal-exists.out	Fri Sep 10 17:59:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r c55d69c5fb77 -r b4d0d646b3f7 tests/test-journal-exists.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-journal-exists.t	Fri Sep 10 19:05:49 2010 +0200
@@ -0,0 +1,34 @@
+  $ hg init
+  $ echo a > a
+  $ hg ci -Am0
+  adding a
+
+  $ hg -q clone . foo
+
+  $ touch .hg/store/journal
+
+  $ echo foo > a
+  $ hg ci -Am0
+  abort: abandoned transaction found - run hg recover!
+
+  $ 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:
+
+  $ 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
+