From 143fe05da17da2d04dfeb587730fe5e71a9f4097 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Thu, 14 Aug 2014 08:34:32 +0300 Subject: [PATCH] Issue #21445: Pass exception messages correctly to assertTrue in the FileCompareTestCase.test_matching test. Patch by Steven Barker. --- 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 index 429e3ffdb1d..b5b24a24c8d 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 2c583247259..b16dd70feb1 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