tests: don't use eval for last call on pifpaf run
Change-Id: I2a597f68cbb04869951e1f2adcd778328115be23
This commit is contained in:
parent
7a80be1f58
commit
8e2972a630
|
@ -2,7 +2,6 @@
|
|||
set -e
|
||||
|
||||
cleanup(){
|
||||
type -t gnocchi_stop >/dev/null && gnocchi_stop || true
|
||||
type -t indexer_stop >/dev/null && indexer_stop || true
|
||||
type -t storage_stop >/dev/null && storage_stop || true
|
||||
}
|
||||
|
@ -42,12 +41,11 @@ for storage in ${GNOCCHI_TEST_STORAGE_DRIVERS}; do
|
|||
esac
|
||||
|
||||
eval $(pifpaf -e INDEXER run $indexer)
|
||||
eval $(pifpaf -e GNOCCHI run gnocchi --indexer-url $INDEXER_URL --storage-url $STORAGE_URL)
|
||||
|
||||
export GNOCCHI_SERVICE_TOKEN="" # Just make gabbi happy
|
||||
export GNOCCHI_AUTHORIZATION="basic YWRtaW46" # admin in base64
|
||||
export OS_TEST_PATH=gnocchi/tests/functional_live
|
||||
./tools/pretty_tox.sh $*
|
||||
pifpaf -e GNOCCHI run gnocchi --indexer-url $INDEXER_URL --storage-url $STORAGE_URL -- ./tools/pretty_tox.sh $*
|
||||
|
||||
cleanup
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue