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 429e3ffdb1d19b3ea5da87fb03658c5b428ca64f..b5b24a24c8ddeab95420a417d714789cda01171b 100644 (file)
--- 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 2c58324725942027677f4280783c091002585e39..b16dd70feb1474b3a86adf3068392b67e27c196a 100644 (file)
--- 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