]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/pybind: fix test_rbd.TestClone.test_trash_snapshot 23256/head
authorMykola Golub <mgolub@suse.com>
Thu, 26 Jul 2018 07:34:57 +0000 (10:34 +0300)
committerMykola Golub <mgolub@suse.com>
Thu, 26 Jul 2018 07:34:57 +0000 (10:34 +0300)
Fixes: http://tracker.ceph.com/issues/25114
Signed-off-by: Mykola Golub <mgolub@suse.com>
src/test/pybind/test_rbd.py

index 8895062209982fef355005069b8c4f325f5fe655..9fa4eb3ed2a8564ed8e1fb13e96bf1998f51d93f 100644 (file)
@@ -1383,12 +1383,14 @@ class TestClone(object):
         rados.conf_set("rbd_default_clone_format", "auto")
 
         self.image.remove_snap('snap2')
-        self.rbd.remove(ioctx, clone_name)
 
         snaps = [s for s in self.image.list_snaps() if s['name'] != 'snap1']
         eq([RBD_SNAP_NAMESPACE_TYPE_TRASH], [s['namespace'] for s in snaps])
         eq([{'original_name' : 'snap2'}], [s['trash'] for s in snaps])
 
+        self.rbd.remove(ioctx, clone_name)
+        eq([], [s for s in self.image.list_snaps() if s['name'] != 'snap1'])
+
 class TestExclusiveLock(object):
 
     @require_features([RBD_FEATURE_EXCLUSIVE_LOCK])