Merge "Remove testtools.main() call from tests"
This commit is contained in:
		| @@ -17,7 +17,6 @@ import os | |||||||
| import testtools | import testtools | ||||||
| import time | import time | ||||||
| import types | import types | ||||||
| import unittest |  | ||||||
| from io import BytesIO | from io import BytesIO | ||||||
|  |  | ||||||
| from six.moves import configparser | from six.moves import configparser | ||||||
| @@ -284,7 +283,3 @@ class TestFunctional(testtools.TestCase): | |||||||
|     def test_get_capabilities(self): |     def test_get_capabilities(self): | ||||||
|         resp = self.conn.get_capabilities() |         resp = self.conn.get_capabilities() | ||||||
|         self.assertTrue(resp.get('swift')) |         self.assertTrue(resp.get('swift')) | ||||||
|  |  | ||||||
|  |  | ||||||
| if __name__ == '__main__': |  | ||||||
|     unittest.main() |  | ||||||
|   | |||||||
| @@ -341,7 +341,3 @@ class TestMultiThreadingManager(ThreadTestCase): | |||||||
|         ], list(err_stream.readlines())) |         ], list(err_stream.readlines())) | ||||||
|  |  | ||||||
|         self.assertEqual(3, thread_manager.error_count) |         self.assertEqual(3, thread_manager.error_count) | ||||||
|  |  | ||||||
|  |  | ||||||
| if __name__ == '__main__': |  | ||||||
|     testtools.main() |  | ||||||
|   | |||||||
| @@ -1166,7 +1166,3 @@ class TestCloseConnection(MockHttpTest): | |||||||
|         conn.close() |         conn.close() | ||||||
|         self.assertEqual(http_conn_obj.isclosed(), True) |         self.assertEqual(http_conn_obj.isclosed(), True) | ||||||
|         self.assertEqual(conn.http_conn, None) |         self.assertEqual(conn.http_conn, None) | ||||||
|  |  | ||||||
|  |  | ||||||
| if __name__ == '__main__': |  | ||||||
|     testtools.main() |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jenkins
					Jenkins