openstack/python-aodhclient
Code Issues Proposed changes

fix functional tests

Browse Source 
Change-Id: I9fbbfd6b974c02a60a916401fe5762572dd18e12
This commit is contained in:
gordon chung
2016-01-04 09:47:03 -05:00
parent b4ea93a306
commit b4547dff50
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aodhclient/tests/functional/test_capabilities.py
View File

@@ -19,4 +19,4 @@ class CapabilitiesClientTest(base.ClientTestBase):
result = self.aodh('capabilities', params="list") result = self.aodh('capabilities', params="list")
caps = self.parser.listing(result)[0] caps = self.parser.listing(result)[0]
self.assertIsNotNone(caps) self.assertIsNotNone(caps)
self.assertEqual('aggregation_methods', caps['Field']) self.assertEqual('alarm_storage', caps['Field'])

6
setup-tests.sh
View File

@@ -21,6 +21,7 @@ AODH_DATA=`mktemp -d /tmp/aodh-data-XXXXX`
MYSQL_DATA=`mktemp -d /tmp/aodh-mysql-XXXXX` MYSQL_DATA=`mktemp -d /tmp/aodh-mysql-XXXXX`
trap "clean_exit \"$AODH_DATA\" \"$MYSQL_DATA\"" EXIT trap "clean_exit \"$AODH_DATA\" \"$MYSQL_DATA\"" EXIT
mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true
mkfifo ${MYSQL_DATA}/out mkfifo ${MYSQL_DATA}/out
PATH=$PATH:/usr/libexec 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 & 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;' mysql --no-defaults -S ${MYSQL_DATA}/mysql.socket -e 'CREATE DATABASE test;'
mkfifo ${AODH_DATA}/out
echo '{"default": ""}' > ${AODH_DATA}/policy.json echo '{"default": ""}' > ${AODH_DATA}/policy.json
cat > ${AODH_DATA}/aodh.conf <<EOF cat > ${AODH_DATA}/aodh.conf <<EOF
[api]
paste_config = ${AODH_DATA}/api-paste.ini
[oslo_policy] [oslo_policy]
policy_file = ${AODH_DATA}/policy.json policy_file = ${AODH_DATA}/policy.json
[database] [database]
@@ -41,7 +45,7 @@ cat <<EOF > ${AODH_DATA}/api-paste.ini
[pipeline:main] [pipeline:main]
pipeline = aodh pipeline = aodh
[app:aodh] [app:aodh]
paste.app_factory = aodh.rest.app:app_factory paste.app_factory = aodh.api.app:app_factory
EOF EOF
aodh-dbsync --config-file ${AODH_DATA}/aodh.conf aodh-dbsync --config-file ${AODH_DATA}/aodh.conf
aodh-api --config-file ${AODH_DATA}/aodh.conf &> ${AODH_DATA}/out & aodh-api --config-file ${AODH_DATA}/aodh.conf &> ${AODH_DATA}/out &

2
test-requirements.txt
View File

@@ -14,6 +14,6 @@ tempest-lib>=0.6.1
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=1.4.0 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 ? # FIXME(sileht): should be in aodh ?
keystonemiddleware keystonemiddleware