diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-30 21:28:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-30 21:28:01 +0000 |
| commit | 3ff85a2963cb8124a294108591373f94ece9180c (patch) | |
| tree | 3308e12fa2e20f760b7a8fbbe7365c20ced8c5e8 | |
| parent | 04d511b2973f61cd1181f329f168fc502fb19357 (diff) | |
| parent | f03f2a2e6e8745681c4336d91b070a9a338cdc62 (diff) | |
| download | nova-3ff85a2963cb8124a294108591373f94ece9180c.tar.gz nova-3ff85a2963cb8124a294108591373f94ece9180c.tar.xz nova-3ff85a2963cb8124a294108591373f94ece9180c.zip | |
Merge "Align ApiEc2TestCase to closer match api-paste.ini"
| -rw-r--r-- | nova/tests/test_api.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index b0367dd8f..37fdec74a 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -32,7 +32,6 @@ from nova.api import ec2 from nova.api.ec2 import apirequest from nova.api.ec2 import ec2utils from nova import block_device -from nova.compute import api as compute_api from nova import context from nova import exception from nova import test @@ -214,9 +213,9 @@ class ApiEc2TestCase(test.TestCase): # NOTE(vish): skipping the Authorizer roles = ['sysadmin', 'netadmin'] ctxt = context.RequestContext('fake', 'fake', roles=roles) - self.app = auth.InjectContext(ctxt, - ec2.Requestify(ec2.Authorizer(ec2.Executor()), - 'nova.api.ec2.cloud.CloudController')) + self.app = auth.InjectContext(ctxt, ec2.FaultWrapper( + ec2.RequestLogging(ec2.Requestify(ec2.Authorizer(ec2.Executor() + ), 'nova.api.ec2.cloud.CloudController')))) def expect_http(self, host=None, is_secure=False, api_version=None): """Returns a new EC2 connection""" |