# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 18:41:32
# Node ID 3aa7b6445aadf27b6bb26ae4d387cdbaf13db11d
# Parent  f933b99eeb14a58081a2f19e0a4f9663c3e8422f

tests: unify test-gpg

diff --git a/tests/test-gpg.out b/tests/test-gpg.out
deleted file mode 100644
--- a/tests/test-gpg.out
+++ /dev/null
@@ -1,9 +0,0 @@
-adding foo
-% no signatures
-% hg sign 0
-Signing 0:e63c23eaa88a
-% hg sigs
-hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0
-% hg sigcheck 0
-e63c23eaa88a is signed by:
- hgtest
diff --git a/tests/test-gpg b/tests/test-gpg.t
old mode 100755
new mode 100644
rename from tests/test-gpg
rename to tests/test-gpg.t
--- a/tests/test-gpg
+++ b/tests/test-gpg.t
@@ -1,28 +1,27 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" gpg || exit 80
-
-cat <<EOF >> $HGRCPATH
-[extensions]
-gpg=
-
-[gpg]
-cmd=gpg --no-permission-warning --no-secmem-warning --homedir $TESTDIR/gpg
-EOF
+Test the GPG extension
 
-hg init r
-cd r
-echo foo > foo
-hg ci -Amfoo
-
-echo '% no signatures'
-hg sigs
+  $ "$TESTDIR/hghave" gpg || exit 80
+  $ cat <<EOF >> $HGRCPATH
+  > [extensions]
+  > gpg=
+  > 
+  > [gpg]
+  > cmd=gpg --no-permission-warning --no-secmem-warning --homedir $TESTDIR/gpg
+  > EOF
+  $ hg init r
+  $ cd r
+  $ echo foo > foo
+  $ hg ci -Amfoo
+  adding foo
 
-echo '% hg sign 0'
-hg sign 0
+  $ hg sigs
+
+  $ hg sign 0
+  Signing 0:e63c23eaa88a
 
-echo '% hg sigs'
-hg sigs
+  $ hg sigs
+  hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0
 
-echo '% hg sigcheck 0'
-hg sigcheck 0
+  $ hg sigcheck 0
+  e63c23eaa88a is signed by:
+   hgtest