# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 19:33:08
# Node ID 0fefeb4fff49c11cf4702c197e76fbcafdd95a57
# Parent  efcbff270317daee53c68f0561466623267f9612

tests: unify test-convert-authormap

diff --git a/tests/test-convert-authormap.out b/tests/test-convert-authormap.out
deleted file mode 100644
--- a/tests/test-convert-authormap.out
+++ /dev/null
@@ -1,27 +0,0 @@
-initializing destination new repository
-Ignoring bad line in author map file authormap.txt: this line is ignored
-scanning source...
-sorting...
-converting...
-0 foo
-Writing author map file new/.hg/authormap
-0
-user name=Long User Name
-changeset:   0:d89716e88087
-tag:         tip
-user:        Long User Name
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     foo
-
-Ignoring bad line in author map file new/.hg/authormap: this line is ignored
-scanning source...
-sorting...
-converting...
-0 foo
-0
-changeset:   0:d89716e88087
-tag:         tip
-user:        Long User Name
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     foo
-
diff --git a/tests/test-convert-authormap b/tests/test-convert-authormap.t
old mode 100755
new mode 100644
rename from tests/test-convert-authormap
rename to tests/test-convert-authormap.t
--- a/tests/test-convert-authormap
+++ b/tests/test-convert-authormap.t
@@ -1,37 +1,58 @@
-#!/bin/sh
 
-cat >> $HGRCPATH <<EOF
-[extensions]
-convert=
-EOF
+  $ cat >> $HGRCPATH <<EOF
+  > [extensions]
+  > convert=
+  > EOF
+
+Prepare orig repo
 
-# Prepare orig repo
-hg init orig
-cd orig
-echo foo > foo
-HGUSER='user name' hg ci -qAm 'foo'
-cd ..
+  $ hg init orig
+  $ cd orig
+  $ echo foo > foo
+  $ HGUSER='user name' hg ci -qAm 'foo'
+  $ cd ..
 
-# Explicit --authors
-cat > authormap.txt <<EOF
-user name = Long User Name
+Explicit --authors
 
-# comment
-this line is ignored
-EOF
-
-hg convert --authors authormap.txt orig new
-echo $?
-cat new/.hg/authormap
+  $ cat > authormap.txt <<EOF
+  > user name = Long User Name
+  > 
+  > # comment
+  > this line is ignored
+  > EOF
+  $ hg convert --authors authormap.txt orig new
+  initializing destination new repository
+  Ignoring bad line in author map file authormap.txt: this line is ignored
+  scanning source...
+  sorting...
+  converting...
+  0 foo
+  Writing author map file new/.hg/authormap
+  $ cat new/.hg/authormap
+  user name=Long User Name
+  $ hg -Rnew log
+  changeset:   0:d89716e88087
+  tag:         tip
+  user:        Long User Name
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     foo
+  
+  $ rm -rf new
 
-hg -Rnew log
-rm -rf new
+Implicit .hg/authormap
 
-# Implicit .hg/authormap
-hg init new
-mv authormap.txt new/.hg/authormap
-
-hg convert orig new
-echo $?
-
-hg -Rnew log
+  $ hg init new
+  $ mv authormap.txt new/.hg/authormap
+  $ hg convert orig new
+  Ignoring bad line in author map file new/.hg/authormap: this line is ignored
+  scanning source...
+  sorting...
+  converting...
+  0 foo
+  $ hg -Rnew log
+  changeset:   0:d89716e88087
+  tag:         tip
+  user:        Long User Name
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     foo
+