From 64b667be5d6b36d17839482593ccf2207af14ac9 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Mon, 29 Aug 2016 22:12:40 +0200
Subject: Python3, now with less features

I want to release a new version ASAP, so lets ditch some features for
now.
---
 test/test.py     | 8 ++++++++
 test/test_cli.py | 1 +
 test/test_lib.py | 8 +++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/test.py b/test/test.py
index 40ba683..8ebecf0 100644
--- a/test/test.py
+++ b/test/test.py
@@ -47,6 +47,14 @@ try:  # exiftool
 except OSError:
     FILE_LIST.remove(('clean é.tif', 'dirty é.tif'))
 
+FILE_LIST.remove(('clean é.docx', 'dirty é.docx'))
+FILE_LIST.remove(('clean é.odt', 'dirty é.odt'))
+FILE_LIST.remove(('clean é.tar', 'dirty é.tar'))
+FILE_LIST.remove(('clean é.tar.bz2', 'dirty é.tar.bz2'))
+FILE_LIST.remove(('clean é.tar.gz', 'dirty é.tar.gz'))
+FILE_LIST.remove(('clean é.zip', 'dirty é.zip'))
+FILE_LIST.remove(('clean é.torrent', 'dirty é.torrent'))
+
 
 class MATTest(unittest.TestCase):
     """
diff --git a/test/test_cli.py b/test/test_cli.py
index 5060a66..7b0c5ad 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -127,6 +127,7 @@ class TestUnsupported(test.MATTest):
     def test_abort_unsupported(self):
         """ test if the cli aborts on unsupported files
         """
+        return
         tarpath = os.path.join(self.tmpdir, "test.tar.bz2")
         tar = tarfile.open(tarpath, "w")
         for f in ('test_lib.py', 'test.py', 'test_cli.py'):
diff --git a/test/test_lib.py b/test/test_lib.py
index 33b3a02..8d3d766 100644
--- a/test/test_lib.py
+++ b/test/test_lib.py
@@ -72,6 +72,7 @@ class TestisCleanlib(test.MATTest):
         """test is_clean on dirty files"""
         for _, dirty in self.file_list:
             current_file = libmat.mat.create_class_file(dirty, False, add2archive=True)
+            print(current_file.filename)
             self.assertFalse(current_file.is_clean())
 
     def test_clean(self):
@@ -131,6 +132,7 @@ class TestArchiveProcessing(test.MATTest):
     def test_remove_bz2(self):
         """ Test MAT's ability to process .tar.bz2
         """
+        return
         tarpath = os.path.join(self.tmpdir, "test.tar.bz2")
         tar = tarfile.open(tarpath, "w:bz2")
         for clean, dirty in self.file_list:
@@ -145,6 +147,7 @@ class TestArchiveProcessing(test.MATTest):
     def test_remove_tar(self):
         """ Test MAT on tar files
         """
+        return
         tarpath = os.path.join(self.tmpdir, "test.tar")
         tar = tarfile.open(tarpath, "w")
         for clean, dirty in self.file_list:
@@ -159,6 +162,7 @@ class TestArchiveProcessing(test.MATTest):
     def test_remove_gz(self):
         """ Test MAT on tar.gz files
         """
+        return
         tarpath = os.path.join(self.tmpdir, "test.tar.gz")
         tar = tarfile.open(tarpath, "w")
         for clean, dirty in self.file_list:
@@ -173,6 +177,7 @@ class TestArchiveProcessing(test.MATTest):
     def test_get_unsupported(self):
         """ Test the get_unsupported feature, used by the GUI
         """
+        return
         tarpath = os.path.join(self.tmpdir, "test.tar.bz2")
         tar = tarfile.open(tarpath, "w")
         for f in ('test_lib.py', 'test.py', 'test_cli.py'):
@@ -183,6 +188,7 @@ class TestArchiveProcessing(test.MATTest):
         self.assertEqual(unsupported_files, {'test_lib.py', 'test.py', 'test_cli.py'})
 
     def test_archive_unwritable_content(self):
+        return
         path = os.path.join(self.tmpdir, './unwritable_content.zip')
         shutil.copy2('./unwritable_content.zip', self.tmpdir)
         current_file = libmat.mat.create_class_file(path, False, add2archive=False)
@@ -199,5 +205,5 @@ def get_tests():
     suite.addTest(unittest.makeSuite(TestisCleanlib))
     suite.addTest(unittest.makeSuite(TestFileAttributes))
     suite.addTest(unittest.makeSuite(TestSecureRemove))
-    suite.addTest(unittest.makeSuite(TestArchiveProcessing))
+    #suite.addTest(unittest.makeSuite(TestArchiveProcessing))
     return suite
-- 
cgit v1.3