From ca15a645a13ac4864d8cc5193456c0eccccd441c Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Sun, 23 Sep 2018 13:58:59 -0700 Subject: [PATCH] [stable/ocata ONLY] Fix functional tests Closes-Bug: #1793915 Change-Id: Icd0a420731663dd15ce584b481f4d85d50c943a2 Needed-By: https://review.openstack.org/#/c/516926/ --- manila_tempest_tests/tests/api/admin/test_quotas.py | 3 --- manila_tempest_tests/tests/api/admin/test_quotas_negative.py | 3 --- manila_tempest_tests/tests/api/base.py | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/manila_tempest_tests/tests/api/admin/test_quotas.py b/manila_tempest_tests/tests/api/admin/test_quotas.py index b0a34d09c0..3ab6596218 100644 --- a/manila_tempest_tests/tests/api/admin/test_quotas.py +++ b/manila_tempest_tests/tests/api/admin/test_quotas.py @@ -78,9 +78,6 @@ class SharesAdminQuotasUpdateTest(base.BaseSharesAdminTest): # create share type cls.share_type = cls._create_share_type() cls.share_type_id = cls.share_type['id'] - # create share group type - cls.share_group_type = cls._create_share_group_type() - cls.share_group_type_id = cls.share_group_type['id'] def setUp(self): super(self.__class__, self).setUp() diff --git a/manila_tempest_tests/tests/api/admin/test_quotas_negative.py b/manila_tempest_tests/tests/api/admin/test_quotas_negative.py index 426e6afc03..35c0c8e31f 100644 --- a/manila_tempest_tests/tests/api/admin/test_quotas_negative.py +++ b/manila_tempest_tests/tests/api/admin/test_quotas_negative.py @@ -39,9 +39,6 @@ class SharesAdminQuotasNegativeTest(base.BaseSharesAdminTest): # create share type cls.share_type = cls._create_share_type() cls.share_type_id = cls.share_type['id'] - # create share group type - cls.share_group_type = cls._create_share_group_type() - cls.share_group_type_id = cls.share_group_type['id'] @tc.attr(base.TAG_NEGATIVE, base.TAG_API) def test_get_quotas_with_empty_tenant_id(self): diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py index 5424c2c04a..79a422c89d 100644 --- a/manila_tempest_tests/tests/api/base.py +++ b/manila_tempest_tests/tests/api/base.py @@ -1012,7 +1012,8 @@ class BaseSharesAdminTest(BaseSharesTest): def setup_clients(cls): super(BaseSharesAdminTest, cls).setup_clients() # Initialise share clients - cls.admin_shares_v2_client = cls.os_admin.share_v2.SharesV2Client() + cls.admin_shares_v2_client = shares_v2_client.SharesV2Client( + cls.os_admin.auth_provider) @classmethod def _create_share_type(cls, specs=None):