Fix tempest test

Improve exception handling this
fix ..if_body_is_empty test

Start using temestest from
monasca-tempest-plugin repository

Story: 2001400
Task: 12524

Depends-On: Ib3ff312fdf2a1d9d22f156ff27e6e1b6c7adcb88
Change-Id: I85f36dbadef1f385907deb5672b1f75bf7f005ec
This commit is contained in:
Adrian Czarnecki 2018-03-26 15:06:18 +02:00
parent 38c233a052
commit 875127d283
5 changed files with 11 additions and 14 deletions

View File

@ -19,6 +19,7 @@
- openstack/tempest
- openstack/monasca-log-api
- openstack/monasca-kibana-plugin
- openstack/monasca-tempest-plugin
- job:
name: monascalog-tempest

View File

@ -101,11 +101,3 @@ sudo chown -R "${USER}":stack $TEMPEST_DIR
load_devstack_utilities
setup_monasca_log
set_tempest_conf
# Run functional tests
echo "Running monasca-log tempest test suite"
(cd $TEMPEST_DIR; testr init)
(cd $TEMPEST_DIR; testr list-tests monasca_log_api_tempest > monasca_log_api_tempest)
(cd $TEMPEST_DIR; cat monasca_log_api_tempest | grep gate > monasca_log_api_tempest_gate)
(cd $TEMPEST_DIR; testr run --subunit --load-list=$TEMPEST_DIR/monasca_log_api_tempest_gate | subunit-trace --fails)

View File

@ -36,6 +36,11 @@ def read_json_msg_body(req):
msg = req.stream.read()
json_msg = rest_utils.from_json(msg)
return json_msg
except rest_utils.exceptions.DataConversionException as ex:
LOG.debug(ex)
raise falcon.HTTPBadRequest('Bad request',
'Request body is not valid JSON')
except ValueError as ex:
LOG.debug(ex)
raise falcon.HTTPBadRequest('Bad request',

View File

@ -30,6 +30,7 @@
[[local|localrc]]
enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api
TEMPEST_PLUGINS+='/opt/stack/new/monasca-tempest-plugin'
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
@ -43,7 +44,9 @@
export ENABLED_SERVICES=tempest
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_TEMPEST_REGEX="monasca_tempest_tests.tests.log_api"
export PROJECTS="openstack/monasca-api $PROJECTS"
export PROJECTS="openstack/monasca-persister $PROJECTS"
@ -57,14 +60,10 @@
export PROJECTS="openstack/monasca-ui $PROJECTS"
export PROJECTS="openstack/monasca-log-api $PROJECTS"
export PROJECTS="openstack/monasca-kibana-plugin $PROJECTS"
function pre_test_hook {
source $BASE/new/monasca-log-api/monasca_log_api_tempest/contrib/pre_test_hook.sh
}
export -f pre_test_hook
export PROJECTS="openstack/monasca-tempest-plugin $PROJECTS"
function post_test_hook {
source $BASE/new/monasca-log-api/monasca_log_api_tempest/contrib/post_test_hook.sh
source $BASE/new/monasca-log-api/contrib/post_test_hook.sh
}
export -f post_test_hook