openstack
/
deb-horizon
Code Issues Proposed changes

Merge "Replace 'assertTrue(a in b)' with 'assertIn(a, b)'"

This commit is contained in:
Jenkins 2016-09-20 10:52:33 +00:00 committed by Gerrit Code Review
parent 3149a19af3 312731ab4c
commit 61439e8ccc
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/access_and_security/tests.py
View File

@ -287,8 +287,8 @@ class SecurityGroupTabTests(test.TestCase):
create_action = self.getAndAssertTableAction(res, 'security_groups',
'create')
self.assertTrue('disabled' in create_action.classes,
'The create button should be disabled')
self.assertIn('disabled', create_action.classes,
'The create button should be disabled')
def test_create_button_disabled_when_quota_exceeded_neutron_disabled(self):
self._test_create_button_disabled_when_quota_exceeded(False)

8
openstack_dashboard/dashboards/project/networks/tests.py
View File

@ -1244,8 +1244,8 @@ class NetworkViewTests(test.TestCase, NetworkStubMixin):
self.assertItemsEqual(networks, self.networks.list())
button = find_button_fn(res)
self.assertTrue('disabled' in button.classes,
"The create button should be disabled")
self.assertIn('disabled', button.classes,
"The create button should be disabled")
return button
@test.create_stubs({api.neutron: ('network_list',),
@ -1327,8 +1327,8 @@ class NetworkViewTests(test.TestCase, NetworkStubMixin):
self.assertItemsEqual(subnets, self.subnets.list())
create_action = self.getAndAssertTableAction(res, 'subnets', 'create')
self.assertTrue('disabled' in create_action.classes,
'The create button should be disabled')
self.assertIn('disabled', create_action.classes,
'The create button should be disabled')
@test.create_stubs({api.neutron: ('network_list',),
quotas: ('tenant_quota_usages',)})

4
openstack_dashboard/dashboards/project/routers/tests.py
View File

@ -807,8 +807,8 @@ class RouterViewTests(RouterMixin, test.TestCase):
self.assertItemsEqual(routers, self.routers.list())
create_action = self.getAndAssertTableAction(res, 'routers', 'create')
self.assertTrue('disabled' in create_action.classes,
'Create button is not disabled')
self.assertIn('disabled', create_action.classes,
'Create button is not disabled')
self.assertEqual('Create Router (Quota exceeded)',
create_action.verbose_name)

8
openstack_dashboard/dashboards/project/volumes/volumes/tests.py
View File

@ -1153,8 +1153,8 @@ class VolumeViewTests(test.ResetImageAPIVersionMixin, test.TestCase):
snapshot_action = self._get_volume_row_action_from_ajax(
res, 'snapshots', volume.id)
self.assertTrue('disabled' in snapshot_action.classes,
'The create snapshot button should be disabled')
self.assertIn('disabled', snapshot_action.classes,
'The create snapshot button should be disabled')
@test.create_stubs({cinder: ('tenant_absolute_limits',
'volume_list_paged',
@ -1229,8 +1229,8 @@ class VolumeViewTests(test.ResetImageAPIVersionMixin, test.TestCase):
self.assertItemsEqual(volumes, self.cinder_volumes.list())
create_action = self.getAndAssertTableAction(res, 'volumes', 'create')
self.assertTrue('disabled' in create_action.classes,
'The create button should be disabled')
self.assertIn('disabled', create_action.classes,
'The create button should be disabled')
@test.create_stubs({cinder: ('tenant_absolute_limits',
'volume_get',