Merge "Fix test bugs for replication CI"

This commit is contained in:
Jenkins 2016-09-01 04:58:34 +00:00 committed by Gerrit Code Review
commit 08e8d130fe
2 changed files with 5 additions and 1 deletions

View File

@ -86,6 +86,10 @@ class ReplicationAdminTest(base.BaseSharesMixedTest):
replica = self.create_share_replica(
share["id"], self.replica_zone, cleanup=False,
client=self.admin_client)
# Wait for replica state to update after creation
self.admin_client.wait_for_share_replica_status(
replica['id'], constants.REPLICATION_STATE_IN_SYNC,
status_attr='replica_state')
# List replicas
replica_list = self.admin_client.list_share_replicas(

View File

@ -58,7 +58,7 @@ class ReplicationAdminTest(base.BaseSharesMixedTest):
client=cls.admin_client)
cls.share_type = share_type["share_type"]
# Create share with above share_type
cls.share = cls.create_share(size=2,
cls.share = cls.create_share(size=CONF.share.share_size+1,
share_type_id=cls.share_type["id"],
availability_zone=cls.share_zone,
client=cls.admin_client)