[PATCH] tests: unify test-manifest

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284153239 -7200
# Node ID 6b8d1d3584ec086ec57a83d0ac7dddfd3d85b13d
# Parent  97e37994a6c365cd84b5430275e54343307d7031
tests: unify test-manifest

diff --git a/tests/test-manifest.out b/tests/test-manifest.out
deleted file mode 100644
--- a/tests/test-manifest.out
+++ /dev/null
@@ -1,25 +0,0 @@
-% should be empty
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-a
-b/a
-l
-644   a
-755 * b/a
-644 @ l
-b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
-b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
-047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
-a
-l
-a
-b/a
-l
-a
-b/a
-l
-% should fail
-abort: unknown revision '2'!
-abort: please specify just one revision
-a
-b/a
-l
diff --git a/tests/test-manifest b/tests/test-manifest.t
old mode 100755
new mode 100644
rename from tests/test-manifest
rename to tests/test-manifest.t
--- a/tests/test-manifest
+++ b/tests/test-manifest.t
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 # Source bundle was generated with the following script.
 #
 # hg init
@@ -11,22 +9,61 @@
 # chmod +x b/a
 # hg ci -Amb -d'1 0'
 
-hg init
-hg -q pull "$TESTDIR/test-manifest.hg"
+  $ hg init
+  $ hg -q pull "$TESTDIR/test-manifest.hg"
 
-echo % should be empty
-hg manifest
 
-hg co
-hg manifest
-hg manifest -v
-hg manifest --debug
-hg manifest -r 0
-hg manifest -r 1
-hg manifest -r tip
+The next call is expected to return nothing:
 
-echo % should fail
-hg manifest -r 2
-hg manifest -r tip tip
+  $ hg manifest
 
-hg manifest tip
+
+  $ hg co
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg manifest
+  a
+  b/a
+  l
+
+  $ hg manifest -v
+  644   a
+  755 * b/a
+  644 @ l
+
+  $ hg manifest --debug
+  b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
+  b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
+  047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
+
+  $ hg manifest -r 0
+  a
+  l
+
+  $ hg manifest -r 1
+  a
+  b/a
+  l
+
+  $ hg manifest -r tip
+  a
+  b/a
+  l
+
+  $ hg manifest tip
+  a
+  b/a
+  l
+
+
+The next two calls are expected to abort:
+
+  $ hg manifest -r 2
+  abort: unknown revision '2'!
+
+  $ hg manifest -r tip tip
+  abort: please specify just one revision
+
+
+  $ true
+