From 843644aed6477b4411ec3f07d1a5271df41c9798 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sat, 18 Jun 2011 23:10:41 -0400
Subject: General cleanup and refactor of a lot of the API/WSGI service code.

---
 nova/tests/integrated/integrated_helpers.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 522c7cb0e..ba6bef62f 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -171,15 +171,14 @@ class _IntegratedTestBase(test.TestCase):
         self.api = self.user.openstack_api
 
     def _start_api_service(self):
-        api_service = service.ApiService.create()
-        api_service.start()
+        #ec2 = service.WSGIService("ec2")
+        #ec2.start()
 
-        if not api_service:
-            raise Exception("API Service was None")
+        osapi = service.WSGIService("osapi")
+        osapi.start()
 
-        self.api_service = api_service
-
-        host, port = api_service.get_socket_info('osapi')
+        host = osapi.server.host
+        port = osapi.server.port
         self.auth_url = 'http://%s:%s/v1.1' % (host, port)
 
     def tearDown(self):
-- 
cgit 


From ea64f883b74fa3c702a3c47d4508a1e7a7f6b40d Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sun, 19 Jun 2011 14:09:09 -0400
Subject: Removed debugging, made objectstore tests pass again.

---
 nova/tests/test_objectstore.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

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()
-- 
cgit 


From 79402ffbaeae18bb4adaa899743a688ef0bcb24b Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sun, 19 Jun 2011 18:00:38 -0400
Subject: Cleanup of the cleanup.

---
 nova/tests/integrated/integrated_helpers.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index ba6bef62f..8809bf5f8 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -171,9 +171,6 @@ class _IntegratedTestBase(test.TestCase):
         self.api = self.user.openstack_api
 
     def _start_api_service(self):
-        #ec2 = service.WSGIService("ec2")
-        #ec2.start()
-
         osapi = service.WSGIService("osapi")
         osapi.start()
 
-- 
cgit 


From c1b70cc20a17e99fedb0f0a93139424fb89dd9e9 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sun, 19 Jun 2011 20:26:47 -0400
Subject: Cleanup.

---
 nova/tests/integrated/integrated_helpers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 8809bf5f8..26de86e74 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -173,10 +173,9 @@ class _IntegratedTestBase(test.TestCase):
     def _start_api_service(self):
         osapi = service.WSGIService("osapi")
         osapi.start()
+        self.auth_url = 'http://%s:%s/v1.1' % (osapi.host, osapi.port)
+        LOG.warn(self.auth_url)
 
-        host = osapi.server.host
-        port = osapi.server.port
-        self.auth_url = 'http://%s:%s/v1.1' % (host, port)
 
     def tearDown(self):
         self.context.cleanup()
-- 
cgit 


From 93d6a1c727ffa5ac2972a26fc8a1e38edc84684a Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sun, 19 Jun 2011 21:29:43 -0400
Subject: No, really. Added tests for WSGI loader.

---
 nova/tests/test_wsgi.py | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 nova/tests/test_wsgi.py

(limited to 'nova/tests')

diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
new file mode 100644
index 000000000..245b51d81
--- /dev/null
+++ b/nova/tests/test_wsgi.py
@@ -0,0 +1,79 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Unit tests for `nova.wsgi`."""
+
+import os.path
+import tempfile
+
+import unittest2 as unittest
+
+import nova.exception
+import nova.test
+import nova.wsgi
+
+
+class TestNothingExists(unittest.TestCase):
+    """Loader tests where os.path.exists always returns False."""
+
+    def setUp(self):
+        self._os_path_exists = os.path.exists
+        os.path.exists = lambda _: False
+
+    def test_config_not_found(self):
+        self.assertRaises(
+            nova.exception.PasteConfigNotFound,
+            nova.wsgi.Loader,
+        )
+
+    def tearDown(self):
+        os.path.exists = self._os_path_exists
+
+
+class TestNormalFilesystem(unittest.TestCase):
+    """Loader tests where os.path.exists always returns True."""
+
+    _paste_config = """
+[app:test_app]
+use = egg:Paste#static
+document_root = /tmp
+    """
+
+    def setUp(self):
+        self.config = tempfile.NamedTemporaryFile(mode="w+t")
+        self.config.write(self._paste_config.lstrip())
+        self.config.seek(0)
+        self.config.flush()
+        self.loader = nova.wsgi.Loader(self.config.name)
+
+    def test_config_found(self):
+       self.assertEquals(self.config.name, self.loader.config_path)
+
+    def test_app_not_found(self):
+        self.assertRaises(
+            nova.exception.PasteAppNotFound,
+            self.loader.load_app,
+            "non-existant app",
+        )
+
+    def test_app_found(self):
+        url_parser = self.loader.load_app("test_app")
+        self.assertEquals("/tmp", url_parser.directory)
+
+    def tearDown(self):
+        self.config.close()
-- 
cgit 


From dd870291a32d18d0f62592a73a03b9038ae5c3da Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Mon, 20 Jun 2011 10:12:43 -0400
Subject: Cleanup and addition of tests for WSGI server.

---
 nova/tests/test_wsgi.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index 245b51d81..c19bd3ef6 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -28,7 +28,7 @@ import nova.test
 import nova.wsgi
 
 
-class TestNothingExists(unittest.TestCase):
+class TestLoaderNothingExists(unittest.TestCase):
     """Loader tests where os.path.exists always returns False."""
 
     def setUp(self):
@@ -45,8 +45,8 @@ class TestNothingExists(unittest.TestCase):
         os.path.exists = self._os_path_exists
 
 
-class TestNormalFilesystem(unittest.TestCase):
-    """Loader tests where os.path.exists always returns True."""
+class TestLoaderNormalFilesystem(unittest.TestCase):
+    """Loader tests with normal filesystem (unmodified os.path module)."""
 
     _paste_config = """
 [app:test_app]
@@ -77,3 +77,18 @@ document_root = /tmp
 
     def tearDown(self):
         self.config.close()
+
+
+class TestWSGIServer(unittest.TestCase):
+    """WSGI server tests."""
+
+    def test_no_app(self):
+        server = nova.wsgi.Server("test_app", None)
+        self.assertEquals("test_app", server.name)
+
+    def test_start_random_port(self):
+        server = nova.wsgi.Server("test_random", None)
+        server.start("127.0.0.1", 0)
+        self.assertNotEqual(0, server.port)
+        server.stop()
+        server.wait()
-- 
cgit 


From 91050cc49e61b46f55722d8fe7e342c2f8ac926b Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Mon, 20 Jun 2011 10:39:17 -0400
Subject: Fix objectstore test.

---
 nova/tests/test_objectstore.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index c35955c9c..be197a219 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -70,8 +70,8 @@ class S3APITestCase(test.TestCase):
         os.mkdir(FLAGS.buckets_path)
 
         router = s3server.S3Application(FLAGS.buckets_path)
-        self.server = wsgi.Server("s3api", router, FLAGS.s3_host, FLAGS.s3_port)
-        self.server.start()
+        self.server = wsgi.Server("s3api", router)
+        self.server.start(FLAGS.s3_host, FLAGS.s3_port)
 
         if not boto.config.has_section('Boto'):
             boto.config.add_section('Boto')
-- 
cgit 


From c178b3ce44d89b662c5925b7b65aab9c2540cf37 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Mon, 20 Jun 2011 14:54:53 -0400
Subject: pep8 fixes

---
 nova/tests/integrated/integrated_helpers.py | 1 -
 nova/tests/test_wsgi.py                     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 26de86e74..47bd8c1e4 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -176,7 +176,6 @@ class _IntegratedTestBase(test.TestCase):
         self.auth_url = 'http://%s:%s/v1.1' % (osapi.host, osapi.port)
         LOG.warn(self.auth_url)
 
-
     def tearDown(self):
         self.context.cleanup()
         super(_IntegratedTestBase, self).tearDown()
diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index c19bd3ef6..be18baa95 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -62,7 +62,7 @@ document_root = /tmp
         self.loader = nova.wsgi.Loader(self.config.name)
 
     def test_config_found(self):
-       self.assertEquals(self.config.name, self.loader.config_path)
+        self.assertEquals(self.config.name, self.loader.config_path)
 
     def test_app_not_found(self):
         self.assertRaises(
-- 
cgit 


From c17c73b3d0f07046c677711853e1b93768526e47 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 21 Jun 2011 00:21:33 -0400
Subject: Tests for WSGI/Launcher

---
 nova/tests/test_service.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index d1cc8bd61..70ef80147 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -21,6 +21,7 @@ Unit Tests for remote procedure calls using queue
 """
 
 import mox
+import unittest2 as unittest
 
 from nova import context
 from nova import db
@@ -30,6 +31,7 @@ from nova import rpc
 from nova import test
 from nova import service
 from nova import manager
+from nova import wsgi
 from nova.compute import manager as compute_manager
 
 FLAGS = flags.FLAGS
@@ -349,3 +351,31 @@ class ServiceTestCase(test.TestCase):
         serv.stop()
 
         db.service_destroy(ctxt, service_ref['id'])
+
+
+class TestWSGIService(test.TestCase):
+
+    def setUp(self):
+        super(TestWSGIService, self).setUp()
+        self.stubs.Set(wsgi.Loader, "load_app", mox.MockAnything())
+
+    def test_service_random_port(self):
+        test_service = service.WSGIService("test_service")
+        self.assertEquals(0, test_service.port)
+        test_service.start()
+        self.assertNotEqual(0, test_service.port)
+        test_service.stop()
+
+class TestLauncher(test.TestCase):
+
+    def setUp(self):
+        super(TestLauncher, self).setUp()
+        self.stubs.Set(wsgi.Loader, "load_app", mox.MockAnything())
+        self.service = service.WSGIService("test_service")
+
+    def test_launch_app(self):
+        self.assertEquals(0, self.service.port)
+        launcher = service.Launcher()
+        launcher.launch_service(self.service)
+        self.assertEquals(0, self.service.port)
+        launcher.stop()
-- 
cgit 


From afff25800521e7085ddff7e910195ef5a1f98732 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 21 Jun 2011 09:57:40 -0400
Subject: pep8 fix

---
 nova/tests/test_service.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 70ef80147..350dc62ee 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -366,6 +366,7 @@ class TestWSGIService(test.TestCase):
         self.assertNotEqual(0, test_service.port)
         test_service.stop()
 
+
 class TestLauncher(test.TestCase):
 
     def setUp(self):
-- 
cgit 


From 742c21e4e79ce5a26975b31486ded3956a846c55 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 21 Jun 2011 11:25:44 -0400
Subject: Very small alterations, switched from using start() to pass
 host/port, to just defining them up front in init. Doesn't make sense to set
 them in start because we can't start more than once any way. Also, unbroke
 binaries.

---
 nova/tests/test_objectstore.py | 4 ++--
 nova/tests/test_wsgi.py        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index be197a219..7e69565f3 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -70,8 +70,8 @@ class S3APITestCase(test.TestCase):
         os.mkdir(FLAGS.buckets_path)
 
         router = s3server.S3Application(FLAGS.buckets_path)
-        self.server = wsgi.Server("s3api", router)
-        self.server.start(FLAGS.s3_host, FLAGS.s3_port)
+        self.server = wsgi.Server()
+        self.server.start(router, host=FLAGS.s3_host, port=FLAGS.s3_port)
 
         if not boto.config.has_section('Boto'):
             boto.config.add_section('Boto')
diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index be18baa95..010fb819e 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -87,8 +87,9 @@ class TestWSGIServer(unittest.TestCase):
         self.assertEquals("test_app", server.name)
 
     def test_start_random_port(self):
-        server = nova.wsgi.Server("test_random", None)
-        server.start("127.0.0.1", 0)
+        server = nova.wsgi.Server("test_random_port", None, host="127.0.0.1")
+        self.assertEqual(0, server.port)
+        server.start()
         self.assertNotEqual(0, server.port)
         server.stop()
         server.wait()
-- 
cgit 


From 7c846ea890f3c7143fd5e158931fc415e53a9bf0 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 21 Jun 2011 11:50:28 -0400
Subject: Fixed objectstore test.

---
 nova/tests/test_objectstore.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

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')
-- 
cgit 


From f6390090ff48258078113b2e6d9dd5fbf49bea3a Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 28 Jun 2011 10:39:04 -0400
Subject: I accidently the whole unittest2

---
 nova/tests/test_service.py | 1 -
 nova/tests/test_wsgi.py    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 350dc62ee..f45f76b73 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -21,7 +21,6 @@ Unit Tests for remote procedure calls using queue
 """
 
 import mox
-import unittest2 as unittest
 
 from nova import context
 from nova import db
diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index 010fb819e..b71e8d418 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -21,7 +21,7 @@
 import os.path
 import tempfile
 
-import unittest2 as unittest
+import unittest
 
 import nova.exception
 import nova.test
-- 
cgit