openstack
/
manila
Code Issues Proposed changes

Merge "Fix race condition in tempest test"

This commit is contained in:
Jenkins 2016-07-31 16:45:41 +00:00 committed by Gerrit Code Review
parent 56c0d2eb19 d5e8b8d9e8
commit d6637a43b8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manila_tempest_tests/tests/api/test_shares.py
View File

@ -57,8 +57,10 @@ class SharesNFSTest(base.BaseSharesTest):
self.assertFalse(share['is_public'])
# The 'status' of the share returned by the create API must be
# the default value - 'creating'.
self.assertEqual('creating', share['status'])
# set and have value either 'creating' or
# 'available' (if share creation is really fast as in
# case of Dummy driver).
self.assertIn(share['status'], ('creating', 'available'))
# Get share using v 2.1 - we expect key 'snapshot_support' to be absent
share_get = self.shares_v2_client.get_share(share['id'], version='2.1')
@ -178,8 +180,10 @@ class SharesNFSTest(base.BaseSharesTest):
self.protocol, snapshot_id=snap["id"], cleanup_in_class=False)
# The 'status' of the share returned by the create API must be
# the default value - 'creating'.
self.assertEqual('creating', child['status'])
# set and have value either 'creating' or
# 'available' (if share creation is really fast as in
# case of Dummy driver).
self.assertIn(child['status'], ('creating', 'available'))
# verify share, created from snapshot
get = self.shares_client.get_share(child["id"])