Fixes #6539 Workaround py26 vs py27 difflib results

2014-03-17 22:21:30 -04:00 · 2014-03-17 22:21:30 -04:00 · 7c5ad1fa23
commit 7c5ad1fa23
parent 9da26da335
1 changed files with 12 additions and 1 deletions
--- a/test/units/TestUtils.py
+++ b/test/units/TestUtils.py
@ -662,8 +662,19 @@ class TestUtils(unittest.TestCase):
            before='fooo',
            after='foo'
        )
+
        standard_expected = """--- before: foo
 +++ after: bar
@@ -1 +1 @@
 -fooo+foo"""
-        self.assertEqual(ansible.utils.get_diff(standard), standard_expected)
+
+        # workaround py26 and py27 difflib differences        
+        standard_expected = """-fooo+foo"""
+        diff = ansible.utils.get_diff(standard)
+        diff = diff.split('\n')
+        del diff[0]
+        del diff[0]
+        del diff[0]
+        diff = '\n'.join(diff)
+        self.assertEqual(diff, unicode(standard_expected))
+