From 7e5548e39db2e8794966a2846d70101cb9462b89 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Wed, 24 Aug 2016 12:19:09 +0100
Subject: [PATCH] Add a test Scenario for uwsgi & nginx

New func_uwsgi-nginx test scenario that will test keystone installed
with uwsgi behind nginx.
This will start off as experimental but can be used to test the final
nginx solution as it is finalised.

Change-Id: Id5ec7b1895b51232aacf1c86e564563de6c21d3f
Related: blueprint keystone-uwsgi
---
 run_tests.sh |  2 +-
 tox.ini      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 0a49aa3e..5b6ca346 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -45,7 +45,7 @@ fi
 
 # run through each tox env and execute the test
 for tox_env in $(awk -F= '/envlist/ {print $2}' tox.ini | sed 's/,/ /g'); do
-  if [ "${tox_env}" != "ansible-functional" ]; then
+  if [[ "${tox_env}" != "ansible-functional" ]] && [[ ${tox_env} != "func_*" ]]; then
     tox -e ${tox_env}
   elif [ "${tox_env}" == "ansible-functional" ]; then
     if ${FUNCTIONAL_TEST}; then
diff --git a/tox.ini b/tox.ini
index 5cb7b46e..affd9e27 100644
--- a/tox.ini
+++ b/tox.ini
@@ -162,6 +162,23 @@ commands =
                      {toxinidir}/tests/test.yml -vvvv
 
 
+# NOTE(andymccr): this will test keystone with uwsgi & nginx
+[testenv:func_uwsgi-nginx]
+install_command =
+    pip install -U --force-reinstall {opts} {packages}
+deps =
+    {[testenv:ansible]deps}
+setenv =
+    {[testenv:ansible]setenv}
+commands =
+    {[testenv:ansible]commands}
+    ansible-playbook -i {toxinidir}/tests/inventory \
+                     -e "rolename={toxinidir}" \
+                     -e "install_test_packages=True" \
+                     -e "keystone_apache_mod_wsgi_enabled=False" \
+                     {toxinidir}/tests/test.yml -vvvv
+
+
 [testenv:linters]
 deps =
     {[testenv:ansible]deps}