Merge "Update tempest to newer commit version" into stable/mitaka

This commit is contained in:
Jenkins 2016-07-27 22:35:59 +00:00 committed by Gerrit Code Review
commit dfef67c2a6
3 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,6 @@
# Environment variables
export MANILA_TEMPEST_COMMIT="df784408" # 7 June, 2016
export MANILA_TEMPEST_COMMIT="613cdbc" # 6 July, 2016
# ----------------------------------------------

View File

@ -133,6 +133,7 @@ export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'}
if [[ "$TEST_TYPE" == "scenario" ]]; then
echo "Set test set to scenario only"
MANILA_TESTS='manila_tempest_tests.tests.scenario'
iniset $TEMPEST_CONFIG auth use_dynamic_credentials True
elif [[ "$DRIVER" == "generic" ]]; then
RUN_MANILA_MANAGE_SNAPSHOT_TESTS=True
if [[ "$POSTGRES_ENABLED" == "True" ]]; then

View File

@ -177,11 +177,11 @@ class BaseSharesTest(test.BaseTestCase):
admin_role=CONF.identity.admin_role,
admin_creds=common_creds.get_configured_admin_credentials())
if "admin" in type_of_creds:
creds = ic.get_admin_creds()
creds = ic.get_admin_creds().credentials
elif "alt" in type_of_creds:
creds = ic.get_alt_creds()
creds = ic.get_alt_creds().credentials
else:
creds = ic.get_credentials(type_of_creds)
creds = ic.get_credentials(type_of_creds).credentials
ic.type_of_creds = type_of_creds
# create client with isolated creds