Merge "Fix unit test indentation and the test itself"

This commit is contained in:
Jenkins 2016-08-25 18:46:40 +00:00 committed by Gerrit Code Review
commit 2ffc81fcb6

View File

@ -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
@ -1511,15 +1510,13 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
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)
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)
tenant_id=self.tenant.id).AndReturn(quota)
self.mox.ReplayAll()
url = reverse('horizon:identity:projects:update',
@ -1529,11 +1526,13 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# 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)
res = self.client.get(url)
finally:
logging.disable(logging.NOTSET)
self.assertNoFormErrors(res)
self.assertMessageCount(error=1, warning=0)
class UsageViewTests(test.BaseAdminViewTests):
def _stub_nova_api_calls(self, nova_stu_enabled=True):