From e2aecad5476908c8a6d40dfa0298e92ca3872f76 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Tue, 7 Jun 2016 17:49:31 +0300 Subject: [PATCH] [Tempest] Bump tempest version Fix small incompatibility that left to be done and bump Tempest version to unblock our CI jobs. Also, remove temporary fix [1] that was done for unblocking CI. [1] I44655c83cc5588c5b94d0fad81162dd0c238b5b4 Change-Id: I12e2652638ba26833f9365f06fa84a98ca24765c --- contrib/ci/common.sh | 2 +- contrib/ci/pre_test_hook.sh | 4 ---- manila_tempest_tests/tests/api/base.py | 7 +++---- .../tests/scenario/test_share_basic_ops.py | 3 ++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/contrib/ci/common.sh b/contrib/ci/common.sh index 8b202272cb..b16b35f331 100755 --- a/contrib/ci/common.sh +++ b/contrib/ci/common.sh @@ -1,6 +1,6 @@ # Environment variables -export MANILA_TEMPEST_COMMIT="aff9cc07" # 10 May, 2016 +export MANILA_TEMPEST_COMMIT="df784408" # 7 June, 2016 # ---------------------------------------------- diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 5bbdd8236a..111a515757 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -96,10 +96,6 @@ echo "MANILA_SERVICE_IMAGE_ENABLED=$MANILA_SERVICE_IMAGE_ENABLED" >> $localrc_pa # created vm's in scenario tests. echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path -# Workaround for broken CI, see bug #1589964. -cd $BASE/new/neutron-fwaas -git revert --no-edit a59df892d3f90f97c967a46b6c18e595d60a9b85 - echo "TEMPEST_USE_TEST_ACCOUNTS=True" >> $localrc_path echo "TEMPEST_ALLOW_TENANT_ISOLATION=False" >> $localrc_path echo "TEMPEST_CONCURRENCY=8" >> $localrc_path diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py index ef409f4927..cd16c604e3 100644 --- a/manila_tempest_tests/tests/api/base.py +++ b/manila_tempest_tests/tests/api/base.py @@ -175,8 +175,7 @@ class BaseSharesTest(test.BaseTestCase): identity_version=CONF.identity.auth_version, name=name, admin_role=CONF.identity.admin_role, - admin_creds=common_creds.get_configured_credentials( - 'identity_admin')) + admin_creds=common_creds.get_configured_admin_credentials()) if "admin" in type_of_creds: creds = ic.get_admin_creds() elif "alt" in type_of_creds: @@ -315,8 +314,8 @@ class BaseSharesTest(test.BaseTestCase): identity_version=CONF.identity.auth_version, name=service_net_name, admin_role=CONF.identity.admin_role, - admin_creds=common_creds.get_configured_credentials( - 'identity_admin')) + admin_creds=( + common_creds.get_configured_admin_credentials())) net_data = ic._create_network_resources(sc.tenant_id) network, subnet, router = net_data net_id = network["id"] diff --git a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py index ef6fc24b59..261a886820 100644 --- a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py +++ b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py @@ -16,6 +16,7 @@ from oslo_log import log as logging from tempest import config # noqa from tempest.lib.common.utils import data_utils +from tempest.lib.common.utils import test_utils from tempest.lib import exceptions from tempest import test # noqa @@ -83,7 +84,7 @@ class ShareBasicOpsBase(manager.ShareScenarioTest): # Obtain a floating IP floating_ip = (self.compute_floating_ips_client.create_floating_ip() ['floating_ip']) - self.addCleanup(self.delete_wrapper, + self.addCleanup(test_utils.call_and_ignore_notfound_exc, self.compute_floating_ips_client.delete_floating_ip, floating_ip['id']) # Attach a floating IP