Merge "Tests: Fix invalid assert calls"
This commit is contained in:
commit
863e645b91
@ -299,7 +299,7 @@ class NetAppNfsDriverTestCase(test.TestCase):
|
|||||||
else:
|
else:
|
||||||
mock_clone_call.assert_called_once_with(expected_source, volume)
|
mock_clone_call.assert_called_once_with(expected_source, volume)
|
||||||
mock_do_qos.assert_not_called()
|
mock_do_qos.assert_not_called()
|
||||||
mock_super_create.not_called()
|
mock_super_create.assert_not_called()
|
||||||
|
|
||||||
@ddt.data(True, False)
|
@ddt.data(True, False)
|
||||||
def test_create_cloned_volume(self, is_flexgroup):
|
def test_create_cloned_volume(self, is_flexgroup):
|
||||||
@ -331,7 +331,7 @@ class NetAppNfsDriverTestCase(test.TestCase):
|
|||||||
else:
|
else:
|
||||||
mock_clone_call.assert_called_once_with(src_vref, volume)
|
mock_clone_call.assert_called_once_with(src_vref, volume)
|
||||||
mock_do_qos.assert_not_called()
|
mock_do_qos.assert_not_called()
|
||||||
mock_super_create.not_called()
|
mock_super_create.assert_not_called()
|
||||||
|
|
||||||
def test_do_qos_for_file_flexgroup(self):
|
def test_do_qos_for_file_flexgroup(self):
|
||||||
volume = {'provider_location': 'fake'}
|
volume = {'provider_location': 'fake'}
|
||||||
|
@ -964,7 +964,7 @@ class SolidFireVolumeTestCase(test.TestCase):
|
|||||||
'_remove_volume_from_vags') as rem_vol:
|
'_remove_volume_from_vags') as rem_vol:
|
||||||
|
|
||||||
sfv.delete_volume(testvol)
|
sfv.delete_volume(testvol)
|
||||||
rem_vol.not_called(get_vol_result['volumeID'])
|
rem_vol.assert_not_called()
|
||||||
|
|
||||||
def test_delete_multiattach_volume(self):
|
def test_delete_multiattach_volume(self):
|
||||||
vol_id = 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'
|
vol_id = 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'
|
||||||
@ -3226,9 +3226,12 @@ class SolidFireVolumeTestCase(test.TestCase):
|
|||||||
fake_context, fake_cinder_vols, secondary_id='secondary',
|
fake_context, fake_cinder_vols, secondary_id='secondary',
|
||||||
groups=None)
|
groups=None)
|
||||||
|
|
||||||
mock_failover.called_with(fake_context, fake_cinder_vols, "secondary",
|
mock_failover.assert_called_once_with(fake_context,
|
||||||
|
fake_cinder_vols,
|
||||||
|
"secondary",
|
||||||
None)
|
None)
|
||||||
mock_failover_completed.called_with(fake_context, "secondary")
|
mock_failover_completed.assert_called_once_with(fake_context,
|
||||||
|
"secondary")
|
||||||
self.assertEqual(cluster_id, "secondary")
|
self.assertEqual(cluster_id, "secondary")
|
||||||
self.assertEqual(fake_failover_updates, updates)
|
self.assertEqual(fake_failover_updates, updates)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user