Merge branch 'test_suite'

3 files changed, 30 insertions, 35 deletions

diff --git a/test/clitest.py b/test/clitest.py
index a818b5d..0b041b9 100644
--- a/test/clitest.py
+++ b/test/clitest.py
@@ -43,8 +43,8 @@ class TestListcli(test.MATTest):
             proc = subprocess.Popen(['../mat', '-d', clean],
                 stdout=subprocess.PIPE)
             stdout, _ = proc.communicate()
-            self.assertEqual(stdout.strip('\n'), "[+] File %s :\nNo harmful \
-metadata found" % clean)
+            self.assertEqual(str(stdout).strip('\n'), "[+] File %s \
+:\nNo harmful metadata found" % clean)
 
     def test_list_dirty(self):
         '''check if get_meta returns all the expected meta'''
@@ -52,7 +52,7 @@ metadata found" % clean)
             proc = subprocess.Popen(['../mat', '-d', dirty],
                 stdout=subprocess.PIPE)
             stdout, _ = proc.communicate()
-            self.assertNotEqual(stdout, "[+] File %s" % dirty)
+            self.assertNotEqual(str(stdout), "[+] File %s" % dirty)
 
 
 class TestisCleancli(test.MATTest):
@@ -65,7 +65,7 @@ class TestisCleancli(test.MATTest):
             proc = subprocess.Popen(['../mat', '-c', clean],
                 stdout=subprocess.PIPE)
             stdout, _ = proc.communicate()
-            self.assertEqual(stdout.strip('\n'), '[+] %s is clean' % clean)
+            self.assertEqual(str(stdout).strip('\n'), '[+] %s is clean' % clean)
 
     def test_dirty(self):
         '''test is_clean on dirty files'''
@@ -73,7 +73,7 @@ class TestisCleancli(test.MATTest):
             proc = subprocess.Popen(['../mat', '-c', dirty],
                 stdout=subprocess.PIPE)
             stdout, _ = proc.communicate()
-            self.assertEqual(stdout.strip('\n'), '[+] %s is not clean' % dirty)
+            self.assertEqual(str(stdout).strip('\n'), '[+] %s is not clean' % dirty)
 
 
 class TestFileAttributes(unittest.TestCase):
@@ -81,26 +81,28 @@ class TestFileAttributes(unittest.TestCase):
         test various stuffs about files (readable, writable, exist, ...)
     '''
     def test_not_writtable(self):
+        ''' test MAT's behaviour on non-writable file'''
         proc = subprocess.Popen(['../mat', 'not_writtable'],
             stdout=subprocess.PIPE)
         stdout, _ = proc.communicate()
-        self.assertEqual(stdout.strip('\n'), 'Unable to pocess  %s' % 'not_writtable')
+        self.assertEqual(str(stdout).strip('\n'), 'Unable to process  %s' % 'not_writtable')
 
     def test_not_exist(self):
+        ''' test MAT's behaviour on non-existent file'''
         proc = subprocess.Popen(['../mat', 'ilikecookies'],
             stdout=subprocess.PIPE)
         stdout, _ = proc.communicate()
-        self.assertEqual(stdout.strip('\n'), 'Unable to pocess  %s' % 'ilikecookies')
+        self.assertEqual(str(stdout).strip('\n'), 'Unable to process  %s' % 'ilikecookies')
 
 
-def main():
+def get_tests():
+    ''' Return every clitests'''
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestRemovecli))
     suite.addTest(unittest.makeSuite(TestListcli))
     suite.addTest(unittest.makeSuite(TestisCleancli))
-    test_result = unittest.TextTestRunner(verbosity=test.VERBOSITY).run(suite)
-    return len(test_result.failures)
+    return suite
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+    unittest.TextTestRunner(verbosity=test.VERBOSITY).run(get_tests())
diff --git a/test/libtest.py b/test/libtest.py
index 9a833f1..2f0ee8f 100644
--- a/test/libtest.py
+++ b/test/libtest.py
@@ -78,15 +78,15 @@ class TestFileAttributes(unittest.TestCase):
         self.assertFalse(mat.create_class_file('ilikecookies', False, True))
 
 
-def main():
-    Suite = unittest.TestSuite()
-    Suite.addTest(unittest.makeSuite(TestRemovelib))
-    Suite.addTest(unittest.makeSuite(TestListlib))
-    Suite.addTest(unittest.makeSuite(TestisCleanlib))
-    Suite.addTest(unittest.makeSuite(TestFileAttributes))
-    test_result = unittest.TextTestRunner(verbosity=test.VERBOSITY).run(Suite)
-    return len(test_result.failures)
+def get_tests():
+    ''' Return every libtests'''
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestRemovelib))
+    suite.addTest(unittest.makeSuite(TestListlib))
+    suite.addTest(unittest.makeSuite(TestisCleanlib))
+    suite.addTest(unittest.makeSuite(TestFileAttributes))
+    return suite
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+    unittest.TextTestRunner(verbosity=test.VERBOSITY).run(get_tests())
diff --git a/test/test.py b/test/test.py
index f09e1c5..675c4f9 100644
--- a/test/test.py
+++ b/test/test.py
@@ -14,7 +14,6 @@ import glob
 import tempfile
 import unittest
 import subprocess
-import sys
 
 VERBOSITY = 3
 
@@ -29,18 +28,18 @@ try:  # PDF render processing
     import poppler
     import cairo
     import pdfrw
-except:
+except ImportError:
     FILE_LIST.remove(('clean é.pdf', 'dirty é.pdf'))
 
 try:  # python-mutagen : audio file format
     import mutagen
-except:
+except ImportError:
     pass  # since wr don't have any ogg for now
     #FILE_LIST.remove(('clean.ogg', 'dirty.ogg'))
 
 try:  # file format exclusively managed by exiftool
     subprocess.Popen('exiftool', stdout=open('/dev/null'))
-except:
+except OSError:
     pass  # None for now
 
 
@@ -68,18 +67,12 @@ class MATTest(unittest.TestCase):
         shutil.rmtree(self.tmpdir)
 
 
-def main():
+if __name__ == '__main__':
     import clitest
     import libtest
 
-    failed_tests = 0
-
-    print('Running cli related tests:\n')
-    failed_tests += clitest.main()
-    print('\nRunning library related tests:\n')
-    failed_tests += libtest.main()
-    print('\nTotal failed tests: ' + str(failed_tests))
-    return failed_tests
+    SUITE = unittest.TestSuite()
+    SUITE.addTests(clitest.get_tests())
+    SUITE.addTests(libtest.get_tests())
 
-if __name__ == '__main__':
-    sys.exit(main())
+    unittest.TextTestRunner(verbosity=VERBOSITY).run(SUITE)