diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-13 15:25:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-13 15:25:47 +0000 |
| commit | 38c4a8a758e3f72482a35975323ec6eb0180a167 (patch) | |
| tree | d1995fcc8fba57422e9bf605123cdd0122815c8d | |
| parent | 549aaf46851d6d06757a7cfaf77be6415e3aa594 (diff) | |
| parent | 94017094dd64b7ea960d7b4ba16604761b61b8ba (diff) | |
| download | keystone-38c4a8a758e3f72482a35975323ec6eb0180a167.tar.gz keystone-38c4a8a758e3f72482a35975323ec6eb0180a167.tar.xz keystone-38c4a8a758e3f72482a35975323ec6eb0180a167.zip | |
Merge "Fix test_contrib_s3_core unit test"
| -rw-r--r-- | tests/test_contrib_s3_core.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/test_contrib_s3_core.py b/tests/test_contrib_s3_core.py index 42315091..0dceefbf 100644 --- a/tests/test_contrib_s3_core.py +++ b/tests/test_contrib_s3_core.py @@ -16,14 +16,20 @@ import uuid -import unittest2 as unittest - from keystone.contrib.s3.core import S3Controller +from keystone.contrib import ec2 + from keystone import exception +from keystone import test -class S3ContribCore(unittest.TestCase): +class S3ContribCore(test.TestCase): def setUp(self): + super(S3ContribCore, self).setUp() + + self.load_backends() + + self.ec2_api = ec2.Manager() self.controller = S3Controller() def test_good_signature(self): |