summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-06-19 14:09:09 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-06-19 14:09:09 -0400
commitea64f883b74fa3c702a3c47d4508a1e7a7f6b40d (patch)
tree3adb513ab176ef16f14b2f39d43b3834e318905a /nova/tests
parent843644aed6477b4411ec3f07d1a5271df41c9798 (diff)
Removed debugging, made objectstore tests pass again.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_objectstore.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index c78772f27..c35955c9c 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -70,11 +70,12 @@ class S3APITestCase(test.TestCase):
os.mkdir(FLAGS.buckets_path)
router = s3server.S3Application(FLAGS.buckets_path)
- server = wsgi.Server()
- server.start(router, FLAGS.s3_port, host=FLAGS.s3_host)
+ self.server = wsgi.Server("s3api", router, FLAGS.s3_host, FLAGS.s3_port)
+ self.server.start()
if not boto.config.has_section('Boto'):
boto.config.add_section('Boto')
+
boto.config.set('Boto', 'num_retries', '0')
conn = s3.S3Connection(aws_access_key_id=self.admin_user.access,
aws_secret_access_key=self.admin_user.secret,
@@ -145,4 +146,5 @@ class S3APITestCase(test.TestCase):
"""Tear down auth and test server."""
self.auth_manager.delete_user('admin')
self.auth_manager.delete_project('admin')
+ self.server.stop()
super(S3APITestCase, self).tearDown()