From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 14 Aug 2014 05:34:32 +0000 (+0300)
Subject: Issue #21445: Pass exception messages correctly to assertTrue in
X-Git-Tag: v3.4.2rc1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=143fe05da17da2d04dfeb587730fe5e71a9f4097;p=python

Issue #21445: Pass exception messages correctly to assertTrue in
the FileCompareTestCase.test_matching test.

Patch by Steven Barker.
---

diff --git a/Lib/test/test_filecmp.py b/Lib/test/test_filecmp.py
index 429e3ffdb1..b5b24a24c8 100644
--- a/Lib/test/test_filecmp.py
+++ b/Lib/test/test_filecmp.py
@@ -27,13 +27,13 @@ class FileCompareTestCase(unittest.TestCase):
         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
index 2c58324725..b16dd70feb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -78,6 +78,7 @@ Michael J. Barber
 Daniel Barclay
 Nicolas Bareil
 Chris Barker
+Steven Barker
 Anton Barkovsky
 Nick Barnes
 Quentin Barnes