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

This commit is contained in:
Jenkins
2014-05-24 09:16:59 +00:00
committed by Gerrit Code Review
3 changed files with 0 additions and 13 deletions

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()