diff --git a/functionaltests/client/__init__.py b/functionaltests/client/__init__.py index 7453542c..4f8f6b1c 100644 --- a/functionaltests/client/__init__.py +++ b/functionaltests/client/__init__.py @@ -22,8 +22,8 @@ CONF = config.CONF # Use local tempest conf if one is available. # This usually means we're running tests outside of devstack -if os.path.exists('./etc/functional_tests.conf'): - CONF.set_config_path('./etc/functional_tests.conf') +if os.path.exists('../etc/functional_tests.conf'): + CONF.set_config_path('../etc/functional_tests.conf') CONF.register_group(cfg.OptGroup('keymanager')) CONF.register_opt(cfg.StrOpt('url'), group='keymanager') diff --git a/functionaltests/post_test_hook.sh b/functionaltests/post_test_hook.sh new file mode 100755 index 00000000..81d78dd2 --- /dev/null +++ b/functionaltests/post_test_hook.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# This script is executed inside post_test_hook function in devstack gate. + +# Install packages from test-requirements.txt +sudo pip install -r /opt/stack/new/python-barbicanclient/test-requirements.txt + +cd /opt/stack/new/barbican/functionaltests +sudo ./run_tests.sh diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh new file mode 100755 index 00000000..05b97c39 --- /dev/null +++ b/functionaltests/run_tests.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# Where tempest code lives + +TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} + +# Install tempest +pip install -e $TEMPEST_DIR + +# Install test-requirements +pip install -r /opt/stack/new/python-barbicanclient/test-requirements.txt + +nosetests -v . diff --git a/test-requirements.txt b/test-requirements.txt index a33f2cd9..92a19154 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,6 +10,7 @@ mock>=1.0 testrepository>=0.0.18 testtools>=0.9.36,!=1.2.0 oslotest>=1.2.0 +nose # Documentation build requirements sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3