From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 6 Nov 2019 23:43:08 +0000 (-0500)
Subject: Merge branch 'master' into patch
X-Git-Tag: v15.1.0~997^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=490e5042e82372848644b68c10466df6036c4008;p=ceph-ci.git

Merge branch 'master' into patch
---

490e5042e82372848644b68c10466df6036c4008
diff --cc src/test/pybind/test_rbd.py
index c941a7babc8,2bd9481484f..8060b50d487
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@@ -762,9 -767,13 +767,16 @@@ class TestImage(object)
          self.image.remove_snap('snap1')
          eq([], list(self.image.list_snaps()))
  
 +    def test_remove_snap_not_found(self):
 +        assert_raises(ImageNotFound, self.image.remove_snap, 'snap1')
 +
+     def test_remove_snap2(self):
+         self.image.create_snap('snap1')
+         self.image.protect_snap('snap1')
+         assert(self.image.is_protected_snap('snap1'))
+         self.image.remove_snap2('snap1',1)
+         eq([], list(self.image.list_snaps()))
+ 
      def test_remove_snap_by_id(self):
  	eq([], list(self.image.list_snaps()))
  	self.image.create_snap('snap1')