Add RBD test for volume not existing during delete

For cases when the volume does not exist in the backend, but Cinder
still knows about it, we just return from the rbd driver and let Cinder
do its thing.

Change-Id: I6150756bdd48259ec8d550fa7a5dc7a9f882ca22

diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py
index c75012e295fcd5b775deaa7417eb939c555caad8..7b05ed1aba6a384fccf832e996ddd082a5aca61d 100644 (file)
--- a/cinder/tests/test_rbd.py
+++ b/cinder/tests/test_rbd.py
@@ -161,6 +161,24 @@ class RBDTestCase(test.TestCase):
                     self.assertFalse(mock_rbd.Image.unprotect_snap.called)
                     self.assertTrue(_mock_rbd.RBD.remove.called)
 
+    @mock.patch('cinder.volume.drivers.rbd.rbd')
+    def test_delete_volume_not_found(self, _mock_rbd):
+        name = u'volume-00000001'
+        volume = dict(name=name)
+
+        class MyMockException(Exception):
+            pass
+
+        _mock_rbd.RBD = mock_rbd.RBD
+        _mock_rbd.ImageNotFound = MyMockException
+        _mock_rbd.Image.side_effect = _mock_rbd.ImageNotFound
+
+        mpo = mock.patch.object
+        with mpo(self.driver, 'rbd', _mock_rbd):
+            with mpo(driver, 'RADOSClient'):
+                self.assertIsNone(self.driver.delete_volume(volume))
+                _mock_rbd.Image.assert_called_once()
+
     @mock.patch('cinder.volume.drivers.rbd.rados')
     @mock.patch('cinder.volume.drivers.rbd.rbd')
     def test_delete_busy_volume(self, _mock_rbd, _mock_rados):