Merge "Support multiple config file with mod_wsgi"

1 files changed, 15 insertions, 0 deletions

diff --git a/nova/tests/unit/api/openstack/test_wsgi_app.py b/nova/tests/unit/api/openstack/test_wsgi_app.py
index 94e2fe5cb1..0eb7011c11 100644
--- a/nova/tests/unit/api/openstack/test_wsgi_app.py
+++ b/nova/tests/unit/api/openstack/test_wsgi_app.py
@@ -104,3 +104,18 @@ document_root = /tmp
             'disable_compute_service_check_for_ffu', True,
             group='workarounds')
         wsgi_app._setup_service('myhost', 'api')
+
+    def test__get_config_files_empty_env(self):
+        env = {}
+        result = wsgi_app._get_config_files(env)
+        expected = ['/etc/nova/api-paste.ini', '/etc/nova/nova.conf']
+        self.assertEqual(result, expected)
+
+    def test__get_config_files_with_env(self):
+        env = {
+            "OS_NOVA_CONFIG_DIR": "/nova",
+            "OS_NOVA_CONFIG_FILES": "api.conf",
+        }
+        result = wsgi_app._get_config_files(env)
+        expected = ['/nova/api.conf']
+        self.assertEqual(result, expected)