diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-24 09:16:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-24 09:16:59 +0000 |
| commit | 5e18d95cb297adaa6f9658241e6dca179ef9ab8d (patch) | |
| tree | 4f5df47d4eb34502f3c7bdd0365b4bca22e1aa0e | |
| parent | eaf4fcbb8d00e9e974c9408e550154fa3cfeefea (diff) | |
| parent | 876238a134d6f0332eeea57e03c3858b452895a1 (diff) | |
| download | python-swiftclient-5e18d95cb297adaa6f9658241e6dca179ef9ab8d.tar.gz | |
Merge "Remove testtools.main() call from tests"
| -rw-r--r-- | tests/functional/test_swiftclient.py | 5 | ||||
| -rw-r--r-- | tests/unit/test_multithreading.py | 4 | ||||
| -rw-r--r-- | tests/unit/test_swiftclient.py | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/tests/functional/test_swiftclient.py b/tests/functional/test_swiftclient.py index 3721e51..f58009a 100644 --- a/tests/functional/test_swiftclient.py +++ b/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() diff --git a/tests/unit/test_multithreading.py b/tests/unit/test_multithreading.py index 875e43a..1df0d4f 100644 --- a/tests/unit/test_multithreading.py +++ b/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() diff --git a/tests/unit/test_swiftclient.py b/tests/unit/test_swiftclient.py index eeb8ab8..35f673a 100644 --- a/tests/unit/test_swiftclient.py +++ b/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() |