openstack/python-cinderclient
Code Issues Proposed changes

Do not require functional_creds.conf for functional tests

Browse Source 
Pass OS_* env variables for functional tests to use environment
variables if they are available instead of config file

Change-Id: Ic1b4752bf558c57974b5f2a4d5a45aee4a940bbb
This commit is contained in:
Ivan Kolodyazhny
2015-11-16 21:16:52 +02:00
parent 6dd17021cf
commit 73f442380c
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cinderclient/tests/functional/hooks/post_test_hook.sh
View File

@@ -37,19 +37,6 @@ sudo chown -R jenkins:stack $CINDERCLIENT_DIR
cd $STACK_DIR cd $STACK_DIR
source openrc admin admin source openrc admin admin
# Store these credentials into the config file
CREDS_FILE=$CINDERCLIENT_DIR/functional_creds.conf
cat <<EOF > $CREDS_FILE
# Credentials for functional testing
[auth]
uri = $OS_AUTH_URL
[admin]
user = $OS_USERNAME
tenant = $OS_TENANT_NAME
pass = $OS_PASSWORD
EOF
# Go to the cinderclient dir # Go to the cinderclient dir
cd $CINDERCLIENT_DIR cd $CINDERCLIENT_DIR

2
tox.ini
View File

@@ -39,7 +39,7 @@ setenv =
# The OS_CACERT environment variable should be passed to the test # The OS_CACERT environment variable should be passed to the test
# environments to specify a CA bundle file to use in verifying a # environments to specify a CA bundle file to use in verifying a
# TLS (https) server certificate. # TLS (https) server certificate.
passenv = OS_CACERT passenv = OS_*
[flake8] [flake8]
show-source = True show-source = True