From 5fd8f1dbb84370c90343e5112951ef5cbea0e3c7 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 25 Dec 2012 01:48:38 +0100 Subject: Partial fix of the testsuite --- MAT/office.py | 10 ++++------ test/clitest.py | 4 ++-- test/libtest.py | 18 +++++++++--------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/MAT/office.py b/MAT/office.py index 223fe84..232a3b8 100644 --- a/MAT/office.py +++ b/MAT/office.py @@ -83,7 +83,7 @@ class OpenDocumentStripper(archive.GenericArchiveStripper): if os.path.isfile(name): try: cfile = mat.create_class_file(name, False, - self.add2archive) + add2archive=self.add2archive) cfile.remove_all() logging.debug('Processing %s from %s' % (item, self.filename)) @@ -107,9 +107,8 @@ class OpenDocumentStripper(archive.GenericArchiveStripper): try: zipin.getinfo('meta.xml') except KeyError: # no meta.xml in the file - kwargs = {'backup':self.backup, 'add2archive':self.add2archive} czf = archive.ZipStripper(self.filename, self.parser, - 'application/zip', **kwargs) + 'application/zip', False, add2archive=self.add2archive) if czf.is_clean(): zipin.close() return True @@ -226,7 +225,7 @@ class OpenXmlStripper(archive.GenericArchiveStripper): if os.path.isfile(name): # don't care about folders try: cfile = mat.create_class_file(name, False, - self.add2archive) + add2archive=self.add2archive) cfile.remove_all() logging.debug('Processing %s from %s' % (item, self.filename)) @@ -251,9 +250,8 @@ class OpenXmlStripper(archive.GenericArchiveStripper): if item.startswith('docProps/'): return False zipin.close() - kwargs = {'backup':self.backup, 'add2archive':self.add2archive} czf = archive.ZipStripper(self.filename, self.parser, - 'application/zip', **kwargs) + 'application/zip', False, add2archive=self.add2archive) return czf.is_clean() def get_meta(self): diff --git a/test/clitest.py b/test/clitest.py index 0b041b9..bc0a7fd 100644 --- a/test/clitest.py +++ b/test/clitest.py @@ -22,14 +22,14 @@ class TestRemovecli(test.MATTest): '''make sure that the cli remove all compromizing meta''' for _, dirty in self.file_list: subprocess.call(['../mat', dirty]) - current_file = mat.create_class_file(dirty, False, True) + current_file = mat.create_class_file(dirty, False, add2archive=True, low_pdf_quality=True) self.assertTrue(current_file.is_clean()) def test_remove_empty(self): '''Test removal with clean files''' for clean, _ in self.file_list: subprocess.call(['../mat', clean]) - current_file = mat.create_class_file(clean, False, True) + current_file = mat.create_class_file(clean, False, add2archive=True, low_pdf_quality=True) self.assertTrue(current_file.is_clean()) diff --git a/test/libtest.py b/test/libtest.py index 2f0ee8f..7b31e3e 100644 --- a/test/libtest.py +++ b/test/libtest.py @@ -19,15 +19,15 @@ class TestRemovelib(test.MATTest): def test_remove(self): '''make sure that the lib remove all compromizing meta''' for _, dirty in self.file_list: - current_file = mat.create_class_file(dirty, False, True) + current_file = mat.create_class_file(dirty, False, add2archive=True, low_pdf_quality=True) current_file.remove_all() - current_file2 = mat.create_class_file(dirty, False, True) + current_file2 = mat.create_class_file(dirty, False, add2archive=True, low_pdf_quality=True) self.assertTrue(current_file2.is_clean()) def test_remove_empty(self): '''Test removal with clean files''' for clean, _ in self.file_list: - current_file = mat.create_class_file(clean, False, True) + current_file = mat.create_class_file(clean, False, add2archive=True, low_pdf_quality=True) current_file.remove_all() self.assertTrue(current_file.is_clean()) @@ -39,14 +39,14 @@ class TestListlib(test.MATTest): def test_list(self): '''check if get_meta returns all the expected meta''' for _, dirty in self.file_list: - current_file = mat.create_class_file(dirty, False, True) + current_file = mat.create_class_file(dirty, False, add2archive=True, low_pdf_quality=True) #FIXME assertisNotNone() : python 2.7 self.assertTrue(current_file.get_meta()) def testlist_list_empty(self): '''check that a listing of a clean file return an empty dict''' for clean, _ in self.file_list: - current_file = mat.create_class_file(clean, False, True) + current_file = mat.create_class_file(clean, False, add2archive=True, low_pdf_quality=True) self.assertEqual(current_file.get_meta(), dict()) @@ -57,13 +57,13 @@ class TestisCleanlib(test.MATTest): def test_dirty(self): '''test is_clean on clean files''' for _, dirty in self.file_list: - current_file = mat.create_class_file(dirty, False, True) + current_file = mat.create_class_file(dirty, False, add2archive=True, low_pdf_quality=True) self.assertFalse(current_file.is_clean()) def test_clean(self): '''test is_clean on dirty files''' for clean, _ in self.file_list: - current_file = mat.create_class_file(clean, False, True) + current_file = mat.create_class_file(clean, False, add2archive=True, low_pdf_quality=True) self.assertTrue(current_file.is_clean()) @@ -72,10 +72,10 @@ class TestFileAttributes(unittest.TestCase): test various stuffs about files (readable, writable, exist, ...) ''' def test_not_writtable(self): - self.assertFalse(mat.create_class_file('not_writtable', False, True)) + self.assertFalse(mat.create_class_file('not_writtable', False, add2archive=True, low_pdf_quality=True)) def test_not_exist(self): - self.assertFalse(mat.create_class_file('ilikecookies', False, True)) + self.assertFalse(mat.create_class_file('ilikecookies', False, add2archive=True, low_pdf_quality=True)) def get_tests(): -- cgit v1.3