openstack
/
cinder
Code Issues Proposed changes

Fix incorrect usage of assertEqual() method in RBD unit tests 

This patch is to fix some incorrect usage of assertEqual() method in RBD
unit tests, and the right way is to use with assertEqual(expected, actual).

Change-Id: Ib38890e5cffbbd5dd2c31fad35bfba442519df26
This commit is contained in:
jeremy.zhang 2018-03-19 20:58:25 +08:00
parent 4fb3b64549
commit a7c0621ac4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/tests/unit/volume/drivers/test_rbd.py
View File

@ -559,8 +559,7 @@ class RBDTestCase(test.TestCase):
self.volume_a, existing_ref)
# Make sure the exception was raised
self.assertEqual(RAISED_EXCEPTIONS,
[self.mock_rbd.ImageExists])
self.assertEqual([self.mock_rbd.ImageExists], RAISED_EXCEPTIONS)
@common_mocks
def test_manage_existing_with_invalid_rbd_image(self):
@ -650,7 +649,7 @@ class RBDTestCase(test.TestCase):
self.assertIsNone(self.driver.delete_volume(self.volume_a))
self.mock_rbd.Image.assert_called_once_with()
# Make sure the exception was raised
self.assertEqual(RAISED_EXCEPTIONS, [self.mock_rbd.ImageNotFound])
self.assertEqual([self.mock_rbd.ImageNotFound], RAISED_EXCEPTIONS)
@common_mocks
def test_delete_busy_volume(self):
@ -715,8 +714,8 @@ class RBDTestCase(test.TestCase):
self.assertEqual(
1, self.mock_rbd.RBD.return_value.remove.call_count)
# Make sure the exception was raised
self.assertEqual(RAISED_EXCEPTIONS,
[self.mock_rbd.ImageNotFound])
self.assertEqual([self.mock_rbd.ImageNotFound],
RAISED_EXCEPTIONS)
@common_mocks
@mock.patch('cinder.objects.Volume.get_by_id')
@ -877,7 +876,7 @@ class RBDTestCase(test.TestCase):
self.assertEqual(2, volume.set_snap.call_count)
volume.parent_info.assert_called_once_with()
# Make sure the exception was raised
self.assertEqual(RAISED_EXCEPTIONS, [self.mock_rbd.ImageNotFound])
self.assertEqual([self.mock_rbd.ImageNotFound], RAISED_EXCEPTIONS)
@common_mocks
def test_get_clone_info_deleted_volume(self):
@ -1963,8 +1962,7 @@ class RBDTestCase(test.TestCase):
self.snapshot_b, existing_ref)
# Make sure the exception was raised
self.assertEqual(RAISED_EXCEPTIONS,
[self.mock_rbd.ImageExists])
self.assertEqual([self.mock_rbd.ImageExists], RAISED_EXCEPTIONS)
@mock.patch('cinder.volume.drivers.rbd.RBDVolumeProxy')
@mock.patch('cinder.volume.drivers.rbd.RADOSClient')