# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1284475952 -7200
# Node ID 3a082866422aa7f3de98ff49764fb3b15d879d58
# Parent  ca31b0b2ac1660bcd89ed994886581924f9e1962
tests: unify test-username-newline

diff -r ca31b0b2ac16 -r 3a082866422a tests/test-username-newline
--- a/tests/test-username-newline	Tue Sep 14 16:42:02 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-
-hg init foo
-cd foo
-touch a
-
-
-unset HGUSER
-echo "[ui]" >> .hg/hgrc
-echo "username= foo" >> .hg/hgrc
-echo "          bar1" >> .hg/hgrc
-
-hg ci -Am m
-
-rm .hg/hgrc
-
-HGUSER=`(echo foo; echo bar2)` hg ci -Am m
-
-hg ci -Am m -u "`(echo foo; echo bar3)`"
-
-true
diff -r ca31b0b2ac16 -r 3a082866422a tests/test-username-newline.out
--- a/tests/test-username-newline.out	Tue Sep 14 16:42:02 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-adding a
-abort: username 'foo\nbar1' contains a newline
-
-abort: username 'foo\nbar2' contains a newline
-
-transaction abort!
-rollback completed
-abort: username 'foo\nbar3' contains a newline!
diff -r ca31b0b2ac16 -r 3a082866422a tests/test-username-newline.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-username-newline.t	Tue Sep 14 16:52:32 2010 +0200
@@ -0,0 +1,24 @@
+  $ hg init
+  $ touch a
+
+  $ unset HGUSER
+  $ echo "[ui]" >> .hg/hgrc
+  $ echo "username= foo" >> .hg/hgrc
+  $ echo "          bar1" >> .hg/hgrc
+
+  $ hg ci -Am m
+  adding a
+  abort: username 'foo\nbar1' contains a newline
+  
+  $ rm .hg/hgrc
+
+  $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
+  abort: username 'foo\nbar2' contains a newline
+  
+  $ hg ci -Am m -u "`(echo foo; echo bar3)`"
+  transaction abort!
+  rollback completed
+  abort: username 'foo\nbar3' contains a newline!
+
+  $ true
+