diff --git a/cinder/tests/unit/volume/drivers/test_nfs.py b/cinder/tests/unit/volume/drivers/test_nfs.py index 51514bc6b97..fb3481f4387 100644 --- a/cinder/tests/unit/volume/drivers/test_nfs.py +++ b/cinder/tests/unit/volume/drivers/test_nfs.py @@ -1520,6 +1520,8 @@ class NfsDriverTestCase(test.TestCase): mock.patch.object(drv, '_read_info_file', return_value={}), \ mock.patch.object(drv, '_do_create_snapshot') \ as mock_do_create_snapshot, \ + mock.patch.object(drv, '_check_snapshot_support') \ + as mock_check_support, \ mock.patch.object(drv, '_write_info_file') \ as mock_write_info_file, \ mock.patch.object(drv, 'get_active_image_from_info', @@ -1528,6 +1530,7 @@ class NfsDriverTestCase(test.TestCase): return_value=snap_path): self._driver.create_snapshot(fake_snap) + mock_check_support.assert_called_once() mock_do_create_snapshot.assert_called_with(fake_snap, volume['name'], snap_path) mock_write_info_file.assert_called_with( diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py index 5174774e376..2315d899d67 100644 --- a/cinder/volume/drivers/nfs.py +++ b/cinder/volume/drivers/nfs.py @@ -594,7 +594,6 @@ class NfsDriver(remotefs.RemoteFSSnapDriverDistributed): def delete_snapshot(self, snapshot): """Apply locking to the delete snapshot operation.""" - self._check_snapshot_support() return self._delete_snapshot(snapshot) def _copy_volume_from_snapshot(self, snapshot, volume, volume_size,