[Python-checkins] cpython (3.4): Issue #21445: Pass exception messages correctly to assertTrue in

[berker.peksag]

http://hg.python.org/cpython/rev/b4bfd98a17c5
changeset:   92091:b4bfd98a17c5
branch:      3.4
parent:      92089:5fd1f8271e8a
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Aug 14 08:34:32 2014 +0300
summary:
  Issue #21445: Pass exception messages correctly to assertTrue in
the FileCompareTestCase.test_matching test.

Patch by Steven Barker.

files:
  Lib/test/test_filecmp.py |  8 ++++----
  Misc/ACKS                |  1 +
  2 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_filecmp.py b/Lib/test/test_filecmp.py
--- a/Lib/test/test_filecmp.py
+++ b/Lib/test/test_filecmp.py
@@ -27,13 +27,13 @@
         os.unlink(self.name_diff)
 
     def test_matching(self):
-        self.assertTrue(filecmp.cmp(self.name, self.name_same),
-                        "Comparing file to itself fails")
-        self.assertTrue(filecmp.cmp(self.name, self.name_same, shallow=False),
+        self.assertTrue(filecmp.cmp(self.name, self.name),
                         "Comparing file to itself fails")
         self.assertTrue(filecmp.cmp(self.name, self.name, shallow=False),
+                        "Comparing file to itself fails")
+        self.assertTrue(filecmp.cmp(self.name, self.name_same),
                         "Comparing file to identical file fails")
-        self.assertTrue(filecmp.cmp(self.name, self.name),
+        self.assertTrue(filecmp.cmp(self.name, self.name_same, shallow=False),
                         "Comparing file to identical file fails")
 
     def test_different(self):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -78,6 +78,7 @@
 Daniel Barclay
 Nicolas Bareil
 Chris Barker
+Steven Barker
 Anton Barkovsky
 Nick Barnes
 Quentin Barnes

-- 
Repository URL: http://hg.python.org/cpython