Merge pull request #28 from DengYiping/master

Fixes breaking Travis CI Tests, Improved code quality

Author: sudheesh001

test.py

@@ -9,12 +9,6 @@ def setUp(self):
         """test proper setup"""
         self.loklak = Loklak()
 
-    def tearDown(self):
-        try:
-            os.remove(self.map_file)
-        except OSError as error:
-            print(error)
-
     def test_hello(self):
         """test hello instance"""
         result = self.loklak.hello()
@@ -102,7 +96,10 @@ def test_get_map(self):
             file_contents = f.read()
         self.assertTrue(os.path.exists(self.map_file))
         self.assertEqual(data, file_contents)
-
+        try:
+            os.remove(self.map_file)
+        except OSError as error:
+            print(error)
     def test_aggregations(self):
         """test aggregations"""
         result = self.loklak.aggregations('sudheesh001','2015-01-10','2015-10-21',['mentions','hashtags'],10)
@@ -112,5 +109,7 @@ def test_aggregations(self):
         self.assertTrue('hashtags' in data['aggregations'])
         self.assertTrue('mentions' in data['aggregations'])
 
+
+
 if __name__ == '__main__':
     unittest.main()