summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-06-21 11:50:28 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-06-21 11:50:28 -0400
commit7c846ea890f3c7143fd5e158931fc415e53a9bf0 (patch)
tree8ac8b7f76cac8c0de88947fbdc4dd248da28839e
parent742c21e4e79ce5a26975b31486ded3956a846c55 (diff)
Fixed objectstore test.
-rw-r--r--nova/service.py4
-rw-r--r--nova/tests/test_objectstore.py7
2 files changed, 7 insertions, 4 deletions
diff --git a/nova/service.py b/nova/service.py
index 854b4572d..ca247c0f9 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -332,8 +332,8 @@ class WSGIService(object):
self.name = name
self.loader = loader or wsgi.Loader()
self.app = self.loader.load_app(name)
- self.host = getattr(FLAGS, '%s_listen' % name, None)
- self.port = getattr(FLAGS, '%s_listen_port' % name, None)
+ self.host = getattr(FLAGS, '%s_listen' % name, "0.0.0.0")
+ self.port = getattr(FLAGS, '%s_listen_port' % name, 0)
self.server = wsgi.Server(name,
self.app,
host=self.host,
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index 7e69565f3..39b4e18d7 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -70,8 +70,11 @@ class S3APITestCase(test.TestCase):
os.mkdir(FLAGS.buckets_path)
router = s3server.S3Application(FLAGS.buckets_path)
- self.server = wsgi.Server()
- self.server.start(router, host=FLAGS.s3_host, port=FLAGS.s3_port)
+ self.server = wsgi.Server("S3 Objectstore",
+ router,
+ host=FLAGS.s3_host,
+ port=FLAGS.s3_port)
+ self.server.start()
if not boto.config.has_section('Boto'):
boto.config.add_section('Boto')