Merge "Remove testtools.main() call from tests"

tests/functional/test_swiftclient.py

@@ -17,7 +17,6 @@ import os
 import testtools
 import time
 import types
-import unittest
 from io import BytesIO
 
 from six.moves import configparser
@@ -284,7 +283,3 @@ class TestFunctional(testtools.TestCase):
     def test_get_capabilities(self):
         resp = self.conn.get_capabilities()
         self.assertTrue(resp.get('swift'))
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/unit/test_multithreading.py

@@ -341,7 +341,3 @@ class TestMultiThreadingManager(ThreadTestCase):
         ], list(err_stream.readlines()))
 
         self.assertEqual(3, thread_manager.error_count)
-
-
-if __name__ == '__main__':
-    testtools.main()

tests/unit/test_swiftclient.py

@@ -1166,7 +1166,3 @@ class TestCloseConnection(MockHttpTest):
         conn.close()
         self.assertEqual(http_conn_obj.isclosed(), True)
         self.assertEqual(conn.http_conn, None)
-
-
-if __name__ == '__main__':
-    testtools.main()