openstack
/
cinder
Code Issues Proposed changes

Merge "[Unity] Fix TypeError for test case test_delete_host_wo_lock" into stable/queens

This commit is contained in:
Zuul 2020-05-20 10:52:38 +00:00 committed by Gerrit Code Review
parent e7506bb535 8072b321ca
commit 356681ccc0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py
View File

@ -63,7 +63,7 @@ class MockResource(object):
raise ex.UnityResourceNotFoundError() raise ex.UnityResourceNotFoundError()
elif self.get_id() == 'snap_in_use': elif self.get_id() == 'snap_in_use':
raise ex.UnityDeleteAttachedSnapError() raise ex.UnityDeleteAttachedSnapError()
elif self.name == 'empty_host': elif self.name == 'empty-host':
raise ex.HostDeleteIsCalled() raise ex.HostDeleteIsCalled()
@property @property
@ -552,7 +552,8 @@ class ClientTest(unittest.TestCase):
host = MockResource(name='empty-host') host = MockResource(name='empty-host')
self.client.host_cache['empty-host'] = host self.client.host_cache['empty-host'] = host
self.assertRaises(ex.HostDeleteIsCalled, self.assertRaises(ex.HostDeleteIsCalled,
self.client.delete_host_wo_lock(host)) self.client.delete_host_wo_lock,
host)
def test_delete_host_wo_lock_remove_from_cache(self): def test_delete_host_wo_lock_remove_from_cache(self):
host = MockResource(name='empty-host-in-cache') host = MockResource(name='empty-host-in-cache')