openstack/python-glanceclient
Code Issues Proposed changes

Fix functional tests in gate

Browse Source 
The check-glanceclient-dsvm-functional gate job was failing due to the
functional tests not picking up valid OpenStack credentials.

Update how we aquire credentials -- fixes side effect of how tox 2.0
handles environment variables.

Change-Id: Ia665dc9673d09421508476d05039d2da8a5e1a29
Closes-bug: 1455102
This commit is contained in:
Stuart McLaren 2015-05-15 13:51:07 +00:00 committed by Nikhil Komawar
parent 688f902305
commit 9f5c58193b
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functional_creds.conf.sample Normal file
View File

@ -0,0 +1,8 @@
# Credentials for functional testing
[auth]
uri = http://10.42.0.50:5000/v2.0
[admin]
user = admin
tenant = admin
pass = secrete

15
glanceclient/tests/functional/base.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import ConfigParser
import os import os
from tempest_lib.cli import base from tempest_lib.cli import base
@ -30,10 +31,24 @@ class ClientTestBase(base.ClientTestBase):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(ClientTestBase, self).__init__(*args, **kwargs) super(ClientTestBase, self).__init__(*args, **kwargs)
# Collecting of credentials:
#
# Support the existence of a functional_creds.conf for
# testing. This makes it possible to use a config file.
self.username = os.environ.get('OS_USERNAME') self.username = os.environ.get('OS_USERNAME')
self.password = os.environ.get('OS_PASSWORD') self.password = os.environ.get('OS_PASSWORD')
self.tenant_name = os.environ.get('OS_TENANT_NAME') self.tenant_name = os.environ.get('OS_TENANT_NAME')
self.uri = os.environ.get('OS_AUTH_URL') self.uri = os.environ.get('OS_AUTH_URL')
config = ConfigParser.RawConfigParser()
if config.read('functional_creds.conf'):
# the OR pattern means the environment is preferred for
# override
self.username = self.username or config.get('admin', 'user')
self.password = self.password or config.get('admin', 'pass')
self.tenant_name = self.tenant_name or config.get('admin',
'tenant')
self.uri = self.uri or config.get('auth', 'uri')
def _get_clients(self): def _get_clients(self):
cli_dir = os.environ.get( cli_dir = os.environ.get(

17
glanceclient/tests/functional/hooks/post_test_hook.sh
View File

@ -28,15 +28,28 @@ function generate_testr_results {
export GLANCECLIENT_DIR="$BASE/new/python-glanceclient" export GLANCECLIENT_DIR="$BASE/new/python-glanceclient"
sudo chown -R jenkins:stack $GLANCECLIENT_DIR
# Get admin credentials # Get admin credentials
cd $BASE/new/devstack cd $BASE/new/devstack
source openrc admin admin source openrc admin admin
# pass the appropriate variables via a config file
CREDS_FILE=$GLANCECLIENT_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 glanceclient dir # Go to the glanceclient dir
cd $GLANCECLIENT_DIR cd $GLANCECLIENT_DIR
sudo chown -R jenkins:stack $GLANCECLIENT_DIR
# Run tests # Run tests
echo "Running glanceclient functional test suite" echo "Running glanceclient functional test suite"
set +e set +e