From b4547dff509117cb0f21c18e82a2702096af5dc7 Mon Sep 17 00:00:00 2001
From: gordon chung <gord@live.ca>
Date: Mon, 4 Jan 2016 09:47:03 -0500
Subject: [PATCH] fix functional tests

Change-Id: I9fbbfd6b974c02a60a916401fe5762572dd18e12
---
 aodhclient/tests/functional/test_capabilities.py | 2 +-
 setup-tests.sh                                   | 6 +++++-
 test-requirements.txt                            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/aodhclient/tests/functional/test_capabilities.py b/aodhclient/tests/functional/test_capabilities.py
index 7f385a0..ccf4e05 100644
--- a/aodhclient/tests/functional/test_capabilities.py
+++ b/aodhclient/tests/functional/test_capabilities.py
@@ -19,4 +19,4 @@ class CapabilitiesClientTest(base.ClientTestBase):
         result = self.aodh('capabilities', params="list")
         caps = self.parser.listing(result)[0]
         self.assertIsNotNone(caps)
-        self.assertEqual('aggregation_methods', caps['Field'])
+        self.assertEqual('alarm_storage', caps['Field'])
diff --git a/setup-tests.sh b/setup-tests.sh
index a450d61..e657a4c 100755
--- a/setup-tests.sh
+++ b/setup-tests.sh
@@ -21,6 +21,7 @@ AODH_DATA=`mktemp -d /tmp/aodh-data-XXXXX`
 MYSQL_DATA=`mktemp -d /tmp/aodh-mysql-XXXXX`
 trap "clean_exit \"$AODH_DATA\" \"$MYSQL_DATA\"" EXIT
 
+mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true
 mkfifo ${MYSQL_DATA}/out
 PATH=$PATH:/usr/libexec
 mysqld --no-defaults --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid --socket=${MYSQL_DATA}/mysql.socket --skip-networking --skip-grant-tables &> ${MYSQL_DATA}/out &
@@ -30,8 +31,11 @@ export AODH_TEST_STORAGE_URL="mysql+pymysql://root@localhost/test?unix_socket=${
 mysql --no-defaults -S ${MYSQL_DATA}/mysql.socket -e 'CREATE DATABASE test;'
 
 
+mkfifo ${AODH_DATA}/out
 echo '{"default": ""}' > ${AODH_DATA}/policy.json
 cat > ${AODH_DATA}/aodh.conf <<EOF
+[api]
+paste_config = ${AODH_DATA}/api-paste.ini
 [oslo_policy]
 policy_file = ${AODH_DATA}/policy.json
 [database]
@@ -41,7 +45,7 @@ cat <<EOF > ${AODH_DATA}/api-paste.ini
 [pipeline:main]
 pipeline = aodh
 [app:aodh]
-paste.app_factory = aodh.rest.app:app_factory
+paste.app_factory = aodh.api.app:app_factory
 EOF
 aodh-dbsync --config-file ${AODH_DATA}/aodh.conf
 aodh-api --config-file ${AODH_DATA}/aodh.conf &> ${AODH_DATA}/out &
diff --git a/test-requirements.txt b/test-requirements.txt
index 4a3c745..a961659 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,6 +14,6 @@ tempest-lib>=0.6.1
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
-http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh
+http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
 # FIXME(sileht): should be in aodh ?
 keystonemiddleware