Merge "Fix unit test indentation and the test itself"
This commit is contained in:
commit
2ffc81fcb6
|
@ -25,7 +25,6 @@ from django.utils import timezone
|
|||
from mox3.mox import IgnoreArg # noqa
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from horizon import exceptions
|
||||
from horizon.workflows import views
|
||||
from openstack_auth import policy as policy_backend
|
||||
|
||||
|
@ -1498,41 +1497,41 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
|
|||
self.assertMessageCount(error=2, warning=1)
|
||||
self.assertRedirectsNoFollow(res, INDEX_URL)
|
||||
|
||||
@test.create_stubs({api.keystone: ('get_default_role',
|
||||
'tenant_get',
|
||||
'domain_get'),
|
||||
quotas: ('get_tenant_quota_data',
|
||||
'get_disabled_quotas')})
|
||||
def test_update_project_when_default_role_does_not_exist(self):
|
||||
project = self.tenants.first()
|
||||
domain_id = project.domain_id
|
||||
quota = self.quotas.first()
|
||||
@test.create_stubs({api.keystone: ('get_default_role',
|
||||
'tenant_get',
|
||||
'domain_get'),
|
||||
quotas: ('get_tenant_quota_data',
|
||||
'get_disabled_quotas')})
|
||||
def test_update_project_when_default_role_does_not_exist(self):
|
||||
project = self.tenants.first()
|
||||
domain_id = project.domain_id
|
||||
quota = self.quotas.first()
|
||||
|
||||
api.keystone.get_default_role(IsA(http.HttpRequest)) \
|
||||
.MultipleTimes().AndReturn(None) # Default role doesn't exist
|
||||
api.keystone.tenant_get(IsA(http.HttpRequest), self.tenant.id,
|
||||
admin=True) \
|
||||
.AndReturn(project)
|
||||
api.keystone.domain_get(IsA(http.HttpRequest), domain_id) \
|
||||
.AndReturn(self.domain)
|
||||
quotas.get_disabled_quotas(IsA(http.HttpRequest)) \
|
||||
.AndReturn(self.disabled_quotas.first())
|
||||
quotas.get_tenant_quota_data(IsA(http.HttpRequest),
|
||||
tenant_id=self.tenant.id) \
|
||||
.AndReturn(quota)
|
||||
self.mox.ReplayAll()
|
||||
api.keystone.get_default_role(IsA(http.HttpRequest)) \
|
||||
.MultipleTimes().AndReturn(None) # Default role doesn't exist
|
||||
api.keystone.tenant_get(IsA(http.HttpRequest), self.tenant.id,
|
||||
admin=True).AndReturn(project)
|
||||
api.keystone.domain_get(IsA(http.HttpRequest), domain_id) \
|
||||
.AndReturn(self.domain)
|
||||
quotas.get_disabled_quotas(IsA(http.HttpRequest)) \
|
||||
.AndReturn(self.disabled_quotas.first())
|
||||
quotas.get_tenant_quota_data(IsA(http.HttpRequest),
|
||||
tenant_id=self.tenant.id).AndReturn(quota)
|
||||
self.mox.ReplayAll()
|
||||
|
||||
url = reverse('horizon:identity:projects:update',
|
||||
args=[self.tenant.id])
|
||||
url = reverse('horizon:identity:projects:update',
|
||||
args=[self.tenant.id])
|
||||
|
||||
try:
|
||||
# Avoid the log message in the test output when the workflow's
|
||||
# step action cannot be instantiated
|
||||
logging.disable(logging.ERROR)
|
||||
with self.assertRaises(exceptions.NotFound):
|
||||
self.client.get(url)
|
||||
finally:
|
||||
logging.disable(logging.NOTSET)
|
||||
try:
|
||||
# Avoid the log message in the test output when the workflow's
|
||||
# step action cannot be instantiated
|
||||
logging.disable(logging.ERROR)
|
||||
res = self.client.get(url)
|
||||
finally:
|
||||
logging.disable(logging.NOTSET)
|
||||
|
||||
self.assertNoFormErrors(res)
|
||||
self.assertMessageCount(error=1, warning=0)
|
||||
|
||||
|
||||
class UsageViewTests(test.BaseAdminViewTests):
|
||||
|
|
Loading…
Reference in New Issue