summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2017-10-22 16:11:39 +0200
committerDean Troyer <dtroyer@gmail.com>2017-10-23 08:34:15 -0500
commitef595fcfc4b42d2a7baeeddee9b804541b81637f (patch)
tree97dd8d70fb34505f2f60728411ccb9e33bd56f76
parent161c79f7037364d6e69e43f1d0a9c605b96ebb88 (diff)
downloadpython-openstackclient-ef595fcfc4b42d2a7baeeddee9b804541b81637f.tar.gz
Add wrapper around ostestr
The functional tests assume that an openrc file has been sourced. Make a simple wrapper that will do that. Change-Id: I42584aaebcbca99a8c922f6ff90c8bbce57bbfbb
-rwxr-xr-xopenstackclient/tests/functional/run_ostestr.sh16
-rw-r--r--tox.ini4
2 files changed, 20 insertions, 0 deletions
diff --git a/openstackclient/tests/functional/run_ostestr.sh b/openstackclient/tests/functional/run_ostestr.sh
new file mode 100755
index 00000000..a6adad96
--- /dev/null
+++ b/openstackclient/tests/functional/run_ostestr.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# This is a script that runs ostestr with the openrc OS_ variables sourced.
+# Do not run this script unless you know what you're doing.
+# For more information refer to:
+# https://docs.openstack.org/python-openstackclient/latest/
+
+# Source environment variables to kick things off
+if [ -f ~stack/devstack/openrc ] ; then
+ source ~stack/devstack/openrc admin admin
+fi
+
+echo 'Running tests with:'
+env | grep OS
+
+ostestr $*
diff --git a/tox.ini b/tox.ini
index 3c1b3c38..a16f0eb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,6 +56,10 @@ commands =
[testenv:functional]
setenv = OS_TEST_PATH=./openstackclient/tests/functional
passenv = OS_*
+# Enable this when running Zuul v3 jobs
+#whitelist_externals = openstackclient/tests/functional/run_ostestr.sh
+#commands =
+# {toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs}
[testenv:functional-tips]
setenv = OS_TEST_PATH=./openstackclient/tests/functional