From 1e58d5c940fc57bcc4c139ffb1b56650b7a455e3 Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Tue, 10 May 2016 21:21:34 +0300 Subject: [PATCH] Bump Tempest version Latest Devstack is not compatible with Tempest version used by Manila after merge of commit [1]. Therefore, bump Tempest's version and fix incompatibilities with plugin. [1] I63658b8d8dfa999e0feb79f8f2968f2b32e3ff57 Change-Id: Ib6fb886f8a17ff6419fd75db74f290f821a3d302 --- contrib/ci/common.sh | 2 +- .../tests/api/admin/test_consistency_groups_negative.py | 6 ------ manila_tempest_tests/tests/api/test_consistency_groups.py | 1 - .../tests/api/test_consistency_groups_negative.py | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/contrib/ci/common.sh b/contrib/ci/common.sh index 3e09aa72..8b202272 100755 --- a/contrib/ci/common.sh +++ b/contrib/ci/common.sh @@ -1,6 +1,6 @@ # Environment variables -export MANILA_TEMPEST_COMMIT="a16bf19e" # 11 Apr, 2016 +export MANILA_TEMPEST_COMMIT="aff9cc07" # 10 May, 2016 # ---------------------------------------------- diff --git a/manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py b/manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py index 18cf5dbf..dfccb6a5 100644 --- a/manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py +++ b/manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py @@ -51,7 +51,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): size=cls.share_size, consistency_group_id=cls.consistency_group['id'], share_type_id=cls.share_type['id'], - client=cls.shares_v2_client, ) # Create a cgsnapshot of the consistency group @@ -76,7 +75,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): self.create_share, size=1, consistency_group_id=self.consistency_group['id'], - client=self.shares_v2_client, version='2.4') @test.attr(type=["negative", "gate", ]) @@ -98,7 +96,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): size=self.share_size, consistency_group_id=consistency_group['id'], cleanup_in_class=False, - client=self.shares_v2_client, version='2.4') # deleting self.shares_v2_client.consistency_group_reset_state( @@ -111,7 +108,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): size=self.share_size, consistency_group_id=consistency_group['id'], cleanup_in_class=False, - client=self.shares_v2_client, version='2.4') # error self.shares_v2_client.consistency_group_reset_state( @@ -124,7 +120,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): size=self.share_size, consistency_group_id=consistency_group['id'], cleanup_in_class=False, - client=self.shares_v2_client, version='2.4') @test.attr(type=["negative", "gate", ]) @@ -178,7 +173,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest): size=share_size, consistency_group_id=consistency_group['id'], cleanup_in_class=False, - client=self.shares_v2_client, version='2.4', ) self.shares_client.reset_state(s_id=share['id']) diff --git a/manila_tempest_tests/tests/api/test_consistency_groups.py b/manila_tempest_tests/tests/api/test_consistency_groups.py index bebd88f2..1f449460 100644 --- a/manila_tempest_tests/tests/api/test_consistency_groups.py +++ b/manila_tempest_tests/tests/api/test_consistency_groups.py @@ -46,7 +46,6 @@ class ConsistencyGroupsTest(base.BaseSharesTest): # Populate share = self.create_share(consistency_group_id=consistency_group['id'], cleanup_in_class=False, - client=self.shares_v2_client, version='2.4') # Delete params = {"consistency_group_id": consistency_group['id']} diff --git a/manila_tempest_tests/tests/api/test_consistency_groups_negative.py b/manila_tempest_tests/tests/api/test_consistency_groups_negative.py index 9e9c696e..74d583c5 100644 --- a/manila_tempest_tests/tests/api/test_consistency_groups_negative.py +++ b/manila_tempest_tests/tests/api/test_consistency_groups_negative.py @@ -47,7 +47,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesTest): description=cls.share_desc, size=cls.share_size, consistency_group_id=cls.consistency_group['id'], - client=cls.shares_v2_client ) # Create a cgsnapshot of the consistency group cls.cgsnap_name = data_utils.rand_name("tempest-cgsnap-name")