openstack/cinder
Code Issues Proposed changes

Merge "Remove deprecated assert_() usage"

Browse Source
This commit is contained in:
Jenkins
2013-09-07 06:39:44 +00:00
committed by Gerrit Code Review
parent 35d17b564e 1c12c4db4e
commit 6db25310d0
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/api/test_extensions.py
View File

@@ -119,7 +119,7 @@ class ExtensionControllerTest(ExtensionTestCase):
# Make sure we have all the extensions, extras extensions being OK.
exts = root.findall('{0}extension'.format(NS))
self.assert_(len(exts) >= len(self.ext_list))
self.assertTrue(len(exts) >= len(self.ext_list))
# Make sure that at least Fox in Sox is correct.
(fox_ext, ) = [x for x in exts if x.get('alias') == 'FOXNSOX']

2
cinder/tests/test_misc.py
View File

@@ -58,4 +58,4 @@ class ProjectTestCase(test.TestCase):
helpful_msg = (_("The following migrations are missing a downgrade:"
"\n\t%s") % '\n\t'.join(sorted(missing_downgrade)))
self.assert_(not missing_downgrade, helpful_msg)
self.assertFalse(missing_downgrade, msg=helpful_msg)

8
cinder/tests/test_policy.py
View File

@@ -204,7 +204,7 @@ class ContextIsAdminPolicyTestCase(test.TestCase):
ctx = context.RequestContext('fake', 'fake', roles=['johnny-admin'])
self.assertFalse(ctx.is_admin)
ctx = context.RequestContext('fake', 'fake', roles=['admin'])
self.assert_(ctx.is_admin)
self.assertTrue(ctx.is_admin)
def test_custom_admin_role_is_admin(self):
# define explict rules for context_is_admin
@@ -214,9 +214,9 @@ class ContextIsAdminPolicyTestCase(test.TestCase):
brain = common_policy.Brain(rules, CONF.policy_default_rule)
common_policy.set_brain(brain)
ctx = context.RequestContext('fake', 'fake', roles=['johnny-admin'])
self.assert_(ctx.is_admin)
self.assertTrue(ctx.is_admin)
ctx = context.RequestContext('fake', 'fake', roles=['administrator'])
self.assert_(ctx.is_admin)
self.assertTrue(ctx.is_admin)
# default rule no longer applies
ctx = context.RequestContext('fake', 'fake', roles=['admin'])
self.assertFalse(ctx.is_admin)
@@ -231,4 +231,4 @@ class ContextIsAdminPolicyTestCase(test.TestCase):
ctx = context.RequestContext('fake', 'fake')
self.assertFalse(ctx.is_admin)
ctx = context.RequestContext('fake', 'fake', roles=['admin'])
self.assert_(ctx.is_admin)
self.assertTrue(ctx.is_admin)

10
cinder/tests/test_service.py
View File

@@ -94,7 +94,7 @@ class ServiceFlagsTestCase(test.TestCase):
app.stop()
ref = db.service_get(context.get_admin_context(), app.service_id)
db.service_destroy(context.get_admin_context(), app.service_id)
self.assert_(not ref['disabled'])
self.assertFalse(ref['disabled'])
def test_service_disabled_on_create_based_on_flag(self):
self.flags(enable_new_services=False)
@@ -105,7 +105,7 @@ class ServiceFlagsTestCase(test.TestCase):
app.stop()
ref = db.service_get(context.get_admin_context(), app.service_id)
db.service_destroy(context.get_admin_context(), app.service_id)
self.assert_(ref['disabled'])
self.assertTrue(ref['disabled'])
class ServiceTestCase(test.TestCase):
@@ -124,7 +124,7 @@ class ServiceTestCase(test.TestCase):
# the looping calls are created in StartService.
app = service.Service.create(host=host, binary=binary, topic=topic)
self.assert_(app)
self.assertTrue(app)
def test_report_state_newly_disconnected(self):
host = 'foo'
@@ -157,7 +157,7 @@ class ServiceTestCase(test.TestCase):
'cinder.tests.test_service.FakeManager')
serv.start()
serv.report_state()
self.assert_(serv.model_disconnected)
self.assertTrue(serv.model_disconnected)
def test_report_state_newly_connected(self):
host = 'foo'
@@ -194,7 +194,7 @@ class ServiceTestCase(test.TestCase):
serv.model_disconnected = True
serv.report_state()
self.assert_(not serv.model_disconnected)
self.assertFalse(serv.model_disconnected)
class TestWSGIService(test.TestCase):