From dae41c8e7d2cfce4e7f6a6a2bd27e0c018cd6a60 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 13 Dec 2012 22:22:02 +0100
Subject: Improve style and pylint's note

---
 test/clitest.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'test/clitest.py')

diff --git a/test/clitest.py b/test/clitest.py
index da2fc08..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,24 +81,27 @@ 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 get_tests():
-    Suite = unittest.TestSuite()
-    Suite.addTest(unittest.makeSuite(TestRemovecli))
-    Suite.addTest(unittest.makeSuite(TestListcli))
-    Suite.addTest(unittest.makeSuite(TestisCleancli))
-    return Suite
+    ''' Return every clitests'''
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestRemovecli))
+    suite.addTest(unittest.makeSuite(TestListcli))
+    suite.addTest(unittest.makeSuite(TestisCleancli))
+    return suite
 
 
 if __name__ == '__main__':
-- 
cgit v1.3