x/python-ganttclient
Code Issues Proposed changes

remove TrialTestCase again and fix merge issues

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-01-14 11:00:47 -08:00
parent 8db70fa374
commit e2baa53409
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/test_api.py
View File

@@ -79,7 +79,7 @@ class FakeHttplibConnection(object):
pass pass
class XmlConversionTestCase(test.TrialTestCase): class XmlConversionTestCase(test.TestCase):
"""Unit test api xml conversion""" """Unit test api xml conversion"""
def test_number_conversion(self): def test_number_conversion(self):
conv = apirequest._try_convert conv = apirequest._try_convert
@@ -96,7 +96,7 @@ class XmlConversionTestCase(test.TrialTestCase):
self.assertEqual(conv('-0'), 0) self.assertEqual(conv('-0'), 0)
class ApiEc2TestCase(test.TrialTestCase): class ApiEc2TestCase(test.TestCase):
"""Unit test for the cloud controller on an EC2 API""" """Unit test for the cloud controller on an EC2 API"""
def setUp(self): def setUp(self):
super(ApiEc2TestCase, self).setUp() super(ApiEc2TestCase, self).setUp()

8
nova/tests/test_log.py
View File

@@ -9,7 +9,7 @@ def _fake_context():
return context.RequestContext(1, 1) return context.RequestContext(1, 1)
class RootLoggerTestCase(test.TrialTestCase): class RootLoggerTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(RootLoggerTestCase, self).setUp() super(RootLoggerTestCase, self).setUp()
self.log = log.logging.root self.log = log.logging.root
@@ -46,7 +46,7 @@ class RootLoggerTestCase(test.TrialTestCase):
self.assert_(True) # didn't raise exception self.assert_(True) # didn't raise exception
class NovaFormatterTestCase(test.TrialTestCase): class NovaFormatterTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(NovaFormatterTestCase, self).setUp() super(NovaFormatterTestCase, self).setUp()
self.flags(logging_context_format_string="HAS CONTEXT "\ self.flags(logging_context_format_string="HAS CONTEXT "\
@@ -78,7 +78,7 @@ class NovaFormatterTestCase(test.TrialTestCase):
self.assertEqual("NOCTXT: baz --DBG\n", self.stream.getvalue()) self.assertEqual("NOCTXT: baz --DBG\n", self.stream.getvalue())
class NovaLoggerTestCase(test.TrialTestCase): class NovaLoggerTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(NovaLoggerTestCase, self).setUp() super(NovaLoggerTestCase, self).setUp()
self.flags(default_log_levels=["nova-test=AUDIT"], verbose=False) self.flags(default_log_levels=["nova-test=AUDIT"], verbose=False)
@@ -96,7 +96,7 @@ class NovaLoggerTestCase(test.TrialTestCase):
self.assertEqual(log.AUDIT, l.level) self.assertEqual(log.AUDIT, l.level)
class VerboseLoggerTestCase(test.TrialTestCase): class VerboseLoggerTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(VerboseLoggerTestCase, self).setUp() super(VerboseLoggerTestCase, self).setUp()
self.flags(default_log_levels=["nova.test=AUDIT"], verbose=True) self.flags(default_log_levels=["nova.test=AUDIT"], verbose=True)

2
nova/tests/test_middleware.py
View File

@@ -38,7 +38,7 @@ def conditional_forbid(req):
return 'OK' return 'OK'
class LockoutTestCase(test.TrialTestCase): class LockoutTestCase(test.TestCase):
"""Test case for the Lockout middleware.""" """Test case for the Lockout middleware."""
def setUp(self): # pylint: disable-msg=C0103 def setUp(self): # pylint: disable-msg=C0103
super(LockoutTestCase, self).setUp() super(LockoutTestCase, self).setUp()

2
nova/tests/test_twistd.py
View File

@@ -28,7 +28,7 @@ from nova import test
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
class TwistdTestCase(test.TrialTestCase): class TwistdTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(TwistdTestCase, self).setUp() super(TwistdTestCase, self).setUp()
self.Options = twistd.WrapTwistedOptions(twistd.TwistdServerOptions) self.Options = twistd.WrapTwistedOptions(twistd.TwistdServerOptions)