diff options
Diffstat (limited to 'Lib/test/test_filecmp.py')
| -rw-r--r-- | Lib/test/test_filecmp.py | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/Lib/test/test_filecmp.py b/Lib/test/test_filecmp.py index 4739ede4eae..09599794ad9 100644 --- a/Lib/test/test_filecmp.py +++ b/Lib/test/test_filecmp.py @@ -1,13 +1,13 @@ import os, filecmp, shutil, tempfile import unittest -from test import test_support +from test import support class FileCompareTestCase(unittest.TestCase): def setUp(self): - self.name = test_support.TESTFN - self.name_same = test_support.TESTFN + '-same' - self.name_diff = test_support.TESTFN + '-diff' + self.name = support.TESTFN + self.name_same = support.TESTFN + '-same' + self.name_diff = support.TESTFN + '-diff' data = 'Contents of file go here.\n' for name in [self.name, self.name_same, self.name_diff]: output = open(name, 'w') @@ -98,37 +98,43 @@ class DirCompareTestCase(unittest.TestCase): def test_dircmp(self): # Check attributes for comparison of two identical directories - d = filecmp.dircmp(self.dir, self.dir_same) + left_dir, right_dir = self.dir, self.dir_same + d = filecmp.dircmp(left_dir, right_dir) + self.assertEqual(d.left, left_dir) + self.assertEqual(d.right, right_dir) if self.caseinsensitive: self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']]) else: self.assertEqual([d.left_list, d.right_list],[['file'], ['file']]) - self.assertTrue(d.common == ['file']) + self.assertEqual(d.common, ['file']) self.assertTrue(d.left_only == d.right_only == []) - self.assertTrue(d.same_files == ['file']) - self.assertTrue(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.assertTrue(d.left_list == ['file']) + left_dir, right_dir = self.dir, self.dir_diff + d = filecmp.dircmp(left_dir, right_dir) + self.assertEqual(d.left, left_dir) + self.assertEqual(d.right, right_dir) + self.assertEqual(d.left_list, ['file']) self.assertTrue(d.right_list == ['file', 'file2']) - self.assertTrue(d.common == ['file']) - self.assertTrue(d.left_only == []) - self.assertTrue(d.right_only == ['file2']) - self.assertTrue(d.same_files == ['file']) - self.assertTrue(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.assertTrue(d.same_files == ['file']) - self.assertTrue(d.diff_files == ['file2']) + self.assertEqual(d.same_files, ['file']) + self.assertEqual(d.diff_files, ['file2']) def test_main(): - test_support.run_unittest(FileCompareTestCase, DirCompareTestCase) + support.run_unittest(FileCompareTestCase, DirCompareTestCase) if __name__ == "__main__": test_main() |