openstack
/
manila
Code Issues Proposed changes

change assert_ to assertTrue 

According to http://docs.python.org/2/library/unittest.html
assert_ is a deprecated alias of assertTrue.

Change-Id: I6bd9658457cf2f6f6fc2d467fcdaa3ad022c2357
This commit is contained in:
Christian Berendt 2014-05-14 21:19:06 +02:00
parent 45dc9bddc5
commit bc43b162d7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,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
manila/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.assertTrue(not missing_downgrade, helpful_msg)

8
manila/tests/test_policy.py
View File

@ -203,7 +203,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
@ -213,9 +213,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)
@ -230,4 +230,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
manila/tests/test_service.py
View File

@ -93,7 +93,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.assertTrue(not ref['disabled'])
def test_service_disabled_on_create_based_on_flag(self):
self.flags(enable_new_services=False)
@ -104,7 +104,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):
@ -123,7 +123,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'
@ -156,7 +156,7 @@ class ServiceTestCase(test.TestCase):
'manila.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'
@ -193,7 +193,7 @@ class ServiceTestCase(test.TestCase):
serv.model_disconnected = True
serv.report_state()
self.assert_(not serv.model_disconnected)
self.assertTrue(not serv.model_disconnected)
class TestWSGIService(test.TestCase):