openstack/python-manilaclient
Code Issues Proposed changes

Merge "Fix duplicate wait functional test"

Browse Source
This commit is contained in:
Zuul
2020-11-19 21:47:21 +00:00
committed by Gerrit Code Review
parent 70937e6f65 c4651bc284
commit 3cc12ce444
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manilaclient/tests/functional/test_shares.py
View File

@@ -54,6 +54,7 @@ class SharesReadWriteBase(base.BaseTestCase):
create = self.create_share( create = self.create_share(
self.protocol, name=name, client=self.user_client) self.protocol, name=name, client=self.user_client)
self.assertEqual("creating", create['status'])
self.assertEqual(name, create['name']) self.assertEqual(name, create['name'])
self.assertEqual('1', create['size']) self.assertEqual('1', create['size'])
self.assertEqual(self.protocol.upper(), create['share_proto']) self.assertEqual(self.protocol.upper(), create['share_proto'])
@@ -92,32 +93,29 @@ class SharesReadWriteBase(base.BaseTestCase):
self.assertEqual('1', get['size']) self.assertEqual('1', get['size'])
self.assertEqual(self.protocol.upper(), get['share_proto']) self.assertEqual(self.protocol.upper(), get['share_proto'])
@ddt.data(True, False) def test_create_delete_with_wait(self):
def test_create_delete_with_wait(self, use_wait_option):
name = data_utils.rand_name('share-with-wait-%s') name = data_utils.rand_name('share-with-wait-%s')
description = data_utils.rand_name('we-wait-until-share-is-ready') description = data_utils.rand_name('we-wait-until-share-is-ready')
share_1, share_2 = ( share_1, share_2 = (
self.create_share(self.protocol, name=(name % num), self.create_share(self.protocol, name=(name % num),
description=description, description=description,
use_wait_option=use_wait_option, use_wait_option=True,
client=self.user_client) client=self.user_client)
for num in range(0, 2) for num in range(0, 2)
) )
expected_status = "available" if use_wait_option else "creating" self.assertEqual("available", share_1['status'])
self.assertEqual(expected_status, share_1['status']) self.assertEqual("available", share_2['status'])
self.assertEqual(expected_status, share_2['status'])
if use_wait_option:
self.delete_share([share_1['id'], share_2['id']], self.delete_share([share_1['id'], share_2['id']],
wait=use_wait_option, wait=True,
client=self.user_client) client=self.user_client)
for share in (share_1, share_2): for share in (share_1, share_2):
self.assertRaises( self.assertRaises(exceptions.NotFound,
exceptions.NotFound, self.user_client.get_share,
self.user_client.get_share, share['id']) share['id'])
@ddt.ddt @ddt.ddt