mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +00:00
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.)
This commit is contained in:
parent
c9b9de1797
commit
e61fd5b5ed
23 changed files with 294 additions and 294 deletions
|
|
@ -103,28 +103,28 @@ class DirCompareTestCase(unittest.TestCase):
|
|||
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():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue