summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-01 17:55:41 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-01 17:55:41 -0500
commitcc15e8a55f8ce3ef70b93b4cc079c7fcc7a5bf66 (patch)
tree98b2f0ec207eadec85e08b3e4bce211ddc25b5a3
parent5a93cc008aeba52530930c99be3f1eb5ac3c912e (diff)
parent884ed0c43130a49ce8f230833ff5d9dd830d4a8a (diff)
downloadnova-cc15e8a55f8ce3ef70b93b4cc079c7fcc7a5bf66.tar.gz
nova-cc15e8a55f8ce3ef70b93b4cc079c7fcc7a5bf66.tar.xz
nova-cc15e8a55f8ce3ef70b93b4cc079c7fcc7a5bf66.zip
Merge branch 'extra_reference'
-rw-r--r--nova/tests/objectstore_unittest.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index 89c1d59c5..cee567c8b 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -28,7 +28,6 @@ import tempfile
from nova import vendor
from nova import flags
-from nova import rpc
from nova import objectstore
from nova import test
from nova.auth import users
@@ -57,7 +56,6 @@ class ObjectStoreTestCase(test.BaseTestCase):
buckets_path=os.path.join(oss_tempdir, 'buckets'),
images_path=os.path.join(oss_tempdir, 'images'),
ca_path=os.path.join(os.path.dirname(__file__), 'CA'))
- self.conn = rpc.Connection.instance()
logging.getLogger().setLevel(logging.DEBUG)
self.um = users.UserManager.instance()