From 76d51771f99b5c05cd1636030f1c47591affd7cb Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Mon, 7 Mar 2016 10:59:43 +0000
Subject: [PATCH] Enable functional testing

This commit uncomments the disablement of the functional test in
tox.ini and also overrides keystone_git_install_branch by pointing to
the SHA currently in openstack-ansible.  This is necessary as master of
keystone will not build using this role due to changes in upstream
keystone.  We can tackle that issue once we have more roles performing
functional testing.

Change-Id: Ia2323fd48c143798ea5fd2815c9b83586d16b0e6
Partial-Bug: #1553957
---
 tests/test.yml |  1 +
 tox.ini        | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/tests/test.yml b/tests/test.yml
index 0c161a95..bfb0b815 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -220,6 +220,7 @@
     keystone_galera_database: keystone
     keystone_venv_tag: "testing"
     keystone_developer_mode: true
+    keystone_git_install_branch: a55128044f763f5cfe2fdc57c738eaca97636448
     keystone_auth_admin_token: "SuperSecreteTestToken"
     keystone_auth_admin_password: "SuperSecretePassword"
     keystone_service_password: "secrete"
diff --git a/tox.ini b/tox.ini
index f7f28abd..24dd0193 100644
--- a/tox.ini
+++ b/tox.ini
@@ -106,23 +106,19 @@ commands =
 
 [testenv:functional]
 commands =
-    echo -e "\n *******************************************************\n" \
-            "**** Functional Testing is still to be implemented ****\n" \
-            "**** TODO: Write tests here                        ****\n" \
-            "*******************************************************\n"
-    # rm -rf {homedir}/.ansible
-    # git clone https://git.openstack.org/openstack/openstack-ansible-plugins \
-    #           {homedir}/.ansible/plugins
+    rm -rf {homedir}/.ansible
+    git clone https://git.openstack.org/openstack/openstack-ansible-plugins \
+              {homedir}/.ansible/plugins
     # This plugin makes the ansible-playbook output easier to read
-    # wget -O {homedir}/.ansible/plugins/callback/human_log.py \
-    #   https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
-    # ansible-galaxy install \
-    #                --role-file={toxinidir}/tests/ansible-role-requirements.yml \
-    #                --ignore-errors \
-    #                --force
-    # ansible-playbook -i {toxinidir}/tests/inventory \
-    #                  -e "rolename={toxinidir}" \
-    #                  {toxinidir}/tests/test.yml
+    wget -O {homedir}/.ansible/plugins/callback/human_log.py \
+      https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
+    ansible-galaxy install \
+                   --role-file={toxinidir}/tests/ansible-role-requirements.yml \
+                   --ignore-errors \
+                   --force
+    ansible-playbook -i {toxinidir}/tests/inventory \
+                     -e "rolename={toxinidir}" \
+                     {toxinidir}/tests/test.yml -vvvv
 
 
 [testenv:linters]