diff -r 917295aaad76 Lib/test/test_filecmp.py --- a/Lib/test/test_filecmp.py Mon Jul 30 00:01:44 2012 +0200 +++ b/Lib/test/test_filecmp.py Tue Jul 31 13:48:53 2012 -0400 @@ -107,6 +107,17 @@ self.assertTrue(d.left_only == d.right_only == []) self.assertEqual(d.same_files, ['file']) self.assertEqual(d.diff_files, []) + pattern = "^diff\s.*?\s.*?\n" \ + "Identical files : \['file'\]$" + with support.captured_stdout() as t: + d.report() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_partial_closure() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_full_closure() + self.assertRegex(t.getvalue(), pattern) # Check attributes for comparison of two different directories d = filecmp.dircmp(self.dir, self.dir_diff) @@ -117,6 +128,18 @@ self.assertEqual(d.right_only, ['file2']) self.assertEqual(d.same_files, ['file']) self.assertEqual(d.diff_files, []) + pattern = "^diff\s.*?\s(?P.*?)\n" \ + "Only in\s(?P=diff) : \['file2'\]\n" \ + "Identical files : \['file'\]$" + with support.captured_stdout() as t: + d.report() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_partial_closure() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_full_closure() + self.assertRegex(t.getvalue(), pattern) # Add different file2 output = open(os.path.join(self.dir, 'file2'), 'w') @@ -125,6 +148,18 @@ d = filecmp.dircmp(self.dir, self.dir_diff) self.assertEqual(d.same_files, ['file']) self.assertEqual(d.diff_files, ['file2']) + pattern = "^diff\s.*?\s.*?\n" \ + "Identical files : \['file'\]\n" \ + "Differing files : \['file2'\]$" + with support.captured_stdout() as t: + d.report() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_partial_closure() + self.assertRegex(t.getvalue(), pattern) + with support.captured_stdout() as t: + d.report_full_closure() + self.assertRegex(t.getvalue(), pattern) def test_main():