From 06cfc52afd17f3bdd5ee3eef06c2307c17f89282 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Thu, 27 Sep 2012 22:12:15 -0400
Subject: [PATCH] fix tests and change nosetests flags so asserts show what
 comparisons failed

---
 Makefile          | 2 +-
 test/TestUtils.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 90fc8fe9834..596dcc5d1aa 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
 all: clean python
 
 tests: 
-	PYTHONPATH=./lib nosetests -v
+	PYTHONPATH=./lib nosetests -d -v
 
 # To force a rebuild of the docs run 'touch VERSION && make docs'
 docs: $(MANPAGES)
diff --git a/test/TestUtils.py b/test/TestUtils.py
index f1b06c55429..b7b20f678e9 100644
--- a/test/TestUtils.py
+++ b/test/TestUtils.py
@@ -300,14 +300,14 @@ class TestUtils(unittest.TestCase):
 
         res = ansible.utils.template("test", template, {})
 
-        assert res == u'hello world\n'
+        assert res == u'hello world'
 
     def test_varReplace_include_script(self):
         template = 'hello $PIPE(echo world)'
 
         res = ansible.utils.template("test", template, {})
 
-        assert res == u'hello world\n'
+        assert res == u'hello world'
 
     #####################################
     ### Template function tests