Merge "Fix mock arg list order in test_driver.py"

This commit is contained in:
Jenkins 2016-11-21 08:13:10 +00:00 committed by Gerrit Code Review
commit a58c7e5173

View File

@ -3879,8 +3879,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
@mock.patch('os.path.getsize', return_value=0) # size doesn't matter @mock.patch('os.path.getsize', return_value=0) # size doesn't matter
@mock.patch('nova.virt.libvirt.storage.lvm.get_volume_size', @mock.patch('nova.virt.libvirt.storage.lvm.get_volume_size',
return_value='fake-size') return_value='fake-size')
def test_detach_encrypted_volumes(self, mock_getsize, def test_detach_encrypted_volumes(self, mock_get_volume_size,
mock_get_volume_size): mock_getsize):
"""Test that unencrypted volumes are not disconnected with dmcrypt.""" """Test that unencrypted volumes are not disconnected with dmcrypt."""
instance = objects.Instance(**self.test_instance) instance = objects.Instance(**self.test_instance)
xml = """ xml = """