openstack/deb-manila
Code Issues Proposed changes

Bump Tempest version

Browse Source 
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
This commit is contained in:
vponomaryov 2016-05-10 21:21:34 +03:00
parent ce24a208ff
commit 1e58d5c940
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/common.sh
View File

@ -1,6 +1,6 @@
# Environment variables # Environment variables
export MANILA_TEMPEST_COMMIT="a16bf19e" # 11 Apr, 2016 export MANILA_TEMPEST_COMMIT="aff9cc07" # 10 May, 2016
# ---------------------------------------------- # ----------------------------------------------

6
manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py
View File

@ -51,7 +51,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
size=cls.share_size, size=cls.share_size,
consistency_group_id=cls.consistency_group['id'], consistency_group_id=cls.consistency_group['id'],
share_type_id=cls.share_type['id'], share_type_id=cls.share_type['id'],
client=cls.shares_v2_client,
) )
# Create a cgsnapshot of the consistency group # Create a cgsnapshot of the consistency group
@ -76,7 +75,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
self.create_share, self.create_share,
size=1, size=1,
consistency_group_id=self.consistency_group['id'], consistency_group_id=self.consistency_group['id'],
client=self.shares_v2_client,
version='2.4') version='2.4')
@test.attr(type=["negative", "gate", ]) @test.attr(type=["negative", "gate", ])
@ -98,7 +96,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
size=self.share_size, size=self.share_size,
consistency_group_id=consistency_group['id'], consistency_group_id=consistency_group['id'],
cleanup_in_class=False, cleanup_in_class=False,
client=self.shares_v2_client,
version='2.4') version='2.4')
# deleting # deleting
self.shares_v2_client.consistency_group_reset_state( self.shares_v2_client.consistency_group_reset_state(
@ -111,7 +108,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
size=self.share_size, size=self.share_size,
consistency_group_id=consistency_group['id'], consistency_group_id=consistency_group['id'],
cleanup_in_class=False, cleanup_in_class=False,
client=self.shares_v2_client,
version='2.4') version='2.4')
# error # error
self.shares_v2_client.consistency_group_reset_state( self.shares_v2_client.consistency_group_reset_state(
@ -124,7 +120,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
size=self.share_size, size=self.share_size,
consistency_group_id=consistency_group['id'], consistency_group_id=consistency_group['id'],
cleanup_in_class=False, cleanup_in_class=False,
client=self.shares_v2_client,
version='2.4') version='2.4')
@test.attr(type=["negative", "gate", ]) @test.attr(type=["negative", "gate", ])
@ -178,7 +173,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesAdminTest):
size=share_size, size=share_size,
consistency_group_id=consistency_group['id'], consistency_group_id=consistency_group['id'],
cleanup_in_class=False, cleanup_in_class=False,
client=self.shares_v2_client,
version='2.4', version='2.4',
) )
self.shares_client.reset_state(s_id=share['id']) self.shares_client.reset_state(s_id=share['id'])

1
manila_tempest_tests/tests/api/test_consistency_groups.py
View File

@ -46,7 +46,6 @@ class ConsistencyGroupsTest(base.BaseSharesTest):
# Populate # Populate
share = self.create_share(consistency_group_id=consistency_group['id'], share = self.create_share(consistency_group_id=consistency_group['id'],
cleanup_in_class=False, cleanup_in_class=False,
client=self.shares_v2_client,
version='2.4') version='2.4')
# Delete # Delete
params = {"consistency_group_id": consistency_group['id']} params = {"consistency_group_id": consistency_group['id']}

1
manila_tempest_tests/tests/api/test_consistency_groups_negative.py
View File

@ -47,7 +47,6 @@ class ConsistencyGroupsNegativeTest(base.BaseSharesTest):
description=cls.share_desc, description=cls.share_desc,
size=cls.share_size, size=cls.share_size,
consistency_group_id=cls.consistency_group['id'], consistency_group_id=cls.consistency_group['id'],
client=cls.shares_v2_client
) )
# Create a cgsnapshot of the consistency group # Create a cgsnapshot of the consistency group
cls.cgsnap_name = data_utils.rand_name("tempest-cgsnap-name") cls.cgsnap_name = data_utils.rand_name("tempest-cgsnap-name")