Removed debugging, made objectstore tests pass again.

3 files changed, 4 insertions, 7 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 6db68be9c..90c8b69ad 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -66,10 +66,7 @@ if __name__ == '__main__':
         flag_get = FLAGS.get(flag, None)
         LOG.debug("%(flag)s : %(flag_get)s" % locals())
 
-
     pool = eventlet.pool.Pool()
     pool.execute(launch, "ec2")
     pool.execute(launch, "osapi")
     pool.wait_all()
-
-    print >>sys.stderr, "Exiting..."
diff --git a/nova/log.py b/nova/log.py
index d3bffdb21..3080daee2 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -325,5 +325,3 @@ class WritableLogger(object):
 
     def write(self, msg):
         self.logger.log(self.level, msg)
-
-
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()