From 94017094dd64b7ea960d7b4ba16604761b61b8ba Mon Sep 17 00:00:00 2001
From: mathrock <nathanael.i.burton.work@gmail.com>
Date: Sun, 10 Feb 2013 01:06:29 -0500
Subject: [PATCH] Fix test_contrib_s3_core unit test

When running the full suite of run_tests.sh the test_contrib_s3_core tests run
fine, however when run standalone the tests fail

Change-Id: I287d05aaab40f441dca9fdca0a5dc6bee1fd073d
Fixes: bug #1120896
---
 tests/test_contrib_s3_core.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/test_contrib_s3_core.py b/tests/test_contrib_s3_core.py
index 423150910e..0dceefbff6 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):