Patch by Christian Heimes to change self.assert_(x == y) into
self.assertEqual(x, y). (Christian used self.failUnlessEqual(),
but the double negative makes it hard to grok, so I changed it.)
diff --git a/Lib/test/test_filecmp.py b/Lib/test/test_filecmp.py
index 503562b..53b949d 100644
--- a/Lib/test/test_filecmp.py
+++ b/Lib/test/test_filecmp.py
@@ -103,28 +103,28 @@
self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']])
else:
self.assertEqual([d.left_list, d.right_list],[['file'], ['file']])
- self.failUnless(d.common == ['file'])
+ self.assertEqual(d.common, ['file'])
self.failUnless(d.left_only == d.right_only == [])
- self.failUnless(d.same_files == ['file'])
- self.failUnless(d.diff_files == [])
+ self.assertEqual(d.same_files, ['file'])
+ self.assertEqual(d.diff_files, [])
# Check attributes for comparison of two different directories
d = filecmp.dircmp(self.dir, self.dir_diff)
- self.failUnless(d.left_list == ['file'])
+ self.assertEqual(d.left_list, ['file'])
self.failUnless(d.right_list == ['file', 'file2'])
- self.failUnless(d.common == ['file'])
- self.failUnless(d.left_only == [])
- self.failUnless(d.right_only == ['file2'])
- self.failUnless(d.same_files == ['file'])
- self.failUnless(d.diff_files == [])
+ self.assertEqual(d.common, ['file'])
+ self.assertEqual(d.left_only, [])
+ self.assertEqual(d.right_only, ['file2'])
+ self.assertEqual(d.same_files, ['file'])
+ self.assertEqual(d.diff_files, [])
# Add different file2
output = open(os.path.join(self.dir, 'file2'), 'w')
output.write('Different contents.\n')
output.close()
d = filecmp.dircmp(self.dir, self.dir_diff)
- self.failUnless(d.same_files == ['file'])
- self.failUnless(d.diff_files == ['file2'])
+ self.assertEqual(d.same_files, ['file'])
+ self.assertEqual(d.diff_files, ['file2'])
def test_main():