From c0d94f8cbd63a1fbe35d49f139fd4374fd0cd199 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 13 Mar 2023 08:55:48 +0000
Subject: [PATCH] test/librados/snapshots*: Enable supported tests

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 04083372485b62233c3b5a1e6a12d28aa2b34524)
---
 src/test/librados/snapshots.cc     | 6 ------
 src/test/librados/snapshots_cxx.cc | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index ab508de184fe0..8175e14af1de2 100644
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -18,7 +18,6 @@ typedef RadosTestEC LibRadosSnapshotsSelfManagedEC;
 const int bufsize = 128;
 
 TEST_F(LibRadosSnapshots, SnapList) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -33,7 +32,6 @@ TEST_F(LibRadosSnapshots, SnapList) {
 }
 
 TEST_F(LibRadosSnapshots, SnapRemove) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -46,7 +44,6 @@ TEST_F(LibRadosSnapshots, SnapRemove) {
 }
 
 TEST_F(LibRadosSnapshots, Rollback) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -62,7 +59,6 @@ TEST_F(LibRadosSnapshots, Rollback) {
 }
 
 TEST_F(LibRadosSnapshots, SnapGetName) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -80,7 +76,6 @@ TEST_F(LibRadosSnapshots, SnapGetName) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManaged, Snap) {
-  SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
@@ -127,7 +122,6 @@ TEST_F(LibRadosSnapshotsSelfManaged, Snap) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManaged, Rollback) {
-  SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
diff --git a/src/test/librados/snapshots_cxx.cc b/src/test/librados/snapshots_cxx.cc
index f2d281d951aaa..de4e30d7603e7 100644
--- a/src/test/librados/snapshots_cxx.cc
+++ b/src/test/librados/snapshots_cxx.cc
@@ -20,7 +20,6 @@ typedef RadosTestECPP LibRadosSnapshotsSelfManagedECPP;
 const int bufsize = 128;
 
 TEST_F(LibRadosSnapshotsPP, SnapListPP) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
@@ -40,7 +39,6 @@ TEST_F(LibRadosSnapshotsPP, SnapListPP) {
 }
 
 TEST_F(LibRadosSnapshotsPP, SnapRemovePP) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
@@ -54,7 +52,6 @@ TEST_F(LibRadosSnapshotsPP, SnapRemovePP) {
 }
 
 TEST_F(LibRadosSnapshotsPP, RollbackPP) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
@@ -74,7 +71,6 @@ TEST_F(LibRadosSnapshotsPP, RollbackPP) {
 }
 
 TEST_F(LibRadosSnapshotsPP, SnapGetNamePP) {
-  SKIP_IF_CRIMSON();
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
@@ -93,7 +89,6 @@ TEST_F(LibRadosSnapshotsPP, SnapGetNamePP) {
 }
 
 TEST_F(LibRadosSnapshotsPP, SnapCreateRemovePP) {
-  SKIP_IF_CRIMSON();
   // reproduces http://tracker.ceph.com/issues/10262
   bufferlist bl;
   bl.append("foo");
@@ -112,7 +107,6 @@ TEST_F(LibRadosSnapshotsPP, SnapCreateRemovePP) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManagedPP, SnapPP) {
-  SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   my_snaps.push_back(-2);
   ASSERT_FALSE(cluster.get_pool_is_selfmanaged_snaps_mode(pool_name));
@@ -244,6 +238,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, RollbackPP) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
+  // WIP https://tracker.ceph.com/issues/58263
   SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   IoCtx readioctx;
@@ -374,7 +369,6 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManagedPP, Bug11677) {
-  SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   my_snaps.push_back(-2);
   ASSERT_EQ(0, ioctx.selfmanaged_snap_create(&my_snaps.back()));
@@ -466,7 +460,6 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, OrderSnap) {
 }
 
 TEST_F(LibRadosSnapshotsSelfManagedPP, ReusePurgedSnap) {
-  SKIP_IF_CRIMSON();
   std::vector<uint64_t> my_snaps;
   my_snaps.push_back(-2);
   ASSERT_EQ(0, ioctx.selfmanaged_snap_create(&my_snaps.back()));
-- 
2.39.5