From 0523e034870ed80cc3916ebb78552d661de4d3b0 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 18 Jun 2011 02:32:47 +0200
Subject: Deletion of the get_harmful_meta part (was useless)

---
 clitest.py | 20 +-------------------
 libtest.py |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/clitest.py b/clitest.py
index f4adbf5..edd0ddb 100755
--- a/clitest.py
+++ b/clitest.py
@@ -30,6 +30,7 @@ class Test_List_cli(test.MATTest):
     def test_list_clean(self):
         '''check if get_meta returns meta'''
         for clean, dirty in self.file_list:
+            #fixme : a (clean|dirty).(jpg|pdf|...).out ?
             proc = subprocess.Popen(['./cli.py', '-d', clean],
                 stdout=subprocess.PIPE)
             stdout, stderr = proc.communicate()
@@ -43,24 +44,6 @@ class Test_List_cli(test.MATTest):
             stdout, stderr = proc.communicate()
             self.assertNotEqual(stdout, "[+] File %s" % dirty)
 
-class Test_List_Harmful_cli(test.MATTest):
-    def test_list_clean(self):
-        '''check if get_meta returns no meta at all'''
-        for clean, dirty in self.file_list:
-            proc = subprocess.Popen(['./cli.py', '--harmful', clean],
-                stdout=subprocess.PIPE)
-            stdout, stderr = proc.communicate()
-            self.assertNotEqual(stdout.strip('\n'), '[+] File %s :' % clean)
-
-    def test_list_dirty(self):
-        '''check if get_meta returns harmful meta'''
-        for clean, dirty in self.file_list:
-            proc = subprocess.Popen(['./cli.py', '--harmful', dirty],
-                stdout=subprocess.PIPE)
-            stdout, stderr = proc.communicate()
-            self.assertNotEqual(stdout.strip('\n'), '[+] File %s :' % dirty)
-
-
 
 class Test_isClean_cli(test.MATTest):
     #FIXME : use an external file with string as const ?
@@ -86,5 +69,4 @@ if __name__ == '__main__':
     suite.addTest(unittest.makeSuite(Test_Remove_cli))
     suite.addTest(unittest.makeSuite(Test_List_cli))
     suite.addTest(unittest.makeSuite(Test_isClean_cli))
-    suite.addTest(unittest.makeSuite(Test_List_Harmful_cli))
     unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/libtest.py b/libtest.py
index c6d5e12..58cc618 100755
--- a/libtest.py
+++ b/libtest.py
@@ -30,7 +30,7 @@ class Test_List_lib(test.MATTest):
         for clean, dirty in self.file_list:
             current_file = mat.create_class_file(dirty)
             meta_list = dict({"fixme":"please"},)
-            self.assertDictEqual(current_file.get_meta(), meta_list)
+            self.assertEqual(current_file.get_meta(), meta_list)
 
     def testlist_list_empty(self):
         '''check that a listing of a clean file return an empty dict'''
-- 
cgit v1.3