From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 20 Jan 2025 19:31:27 +0000 (+0000)
Subject: crimson/osd, test: turn the EC tests on for crimson
X-Git-Tag: v21.0.0~3^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44c96e417566ad1f0b11e6558e0be78efeb811d3;p=ceph.git

crimson/osd, test: turn the EC tests on for crimson

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc
index b224a4976505..b6610470d3aa 100644
--- a/src/test/librados/TestCase.cc
+++ b/src/test/librados/TestCase.cc
@@ -165,7 +165,6 @@ rados_t RadosTestEC::s_cluster = NULL;
 
 void RadosTestEC::SetUpTestCase()
 {
-  SKIP_IF_CRIMSON();
   auto pool_prefix = fmt::format("{}_", ::testing::UnitTest::GetInstance()->current_test_case()->name()); 
   pool_name = get_temp_pool_name(pool_prefix);
   ASSERT_EQ("", create_one_ec_pool(pool_name, &s_cluster));
@@ -173,13 +172,11 @@ void RadosTestEC::SetUpTestCase()
 
 void RadosTestEC::TearDownTestCase()
 {
-  SKIP_IF_CRIMSON();
   ASSERT_EQ(0, destroy_one_ec_pool(pool_name, &s_cluster));
 }
 
 void RadosTestEC::SetUp()
 {
-  SKIP_IF_CRIMSON();
   cluster = RadosTestEC::s_cluster;
   ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx));
   nspace = get_temp_pool_name();
@@ -193,7 +190,6 @@ void RadosTestEC::SetUp()
 
 void RadosTestEC::TearDown()
 {
-  SKIP_IF_CRIMSON();
   if (cleanup) {
     cleanup_default_namespace(ioctx);
     cleanup_namespace(ioctx, nspace);
diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
index 771a5f5d41ae..c762891687ea 100644
--- a/src/test/librados/aio.cc
+++ b/src/test/librados/aio.cc
@@ -1099,7 +1099,6 @@ public:
 };
 
 TEST(LibRadosAioEC, SimpleWrite) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1131,7 +1130,6 @@ TEST(LibRadosAioEC, SimpleWrite) {
 }
 
 TEST(LibRadosAioEC, WaitForComplete) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1148,7 +1146,6 @@ TEST(LibRadosAioEC, WaitForComplete) {
 }
 
 TEST(LibRadosAioEC, RoundTrip) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1181,7 +1178,6 @@ TEST(LibRadosAioEC, RoundTrip) {
 }
 
 TEST(LibRadosAioEC, RoundTrip2) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1214,7 +1210,6 @@ TEST(LibRadosAioEC, RoundTrip2) {
 }
 
 TEST(LibRadosAioEC, RoundTripAppend) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion, my_completion2, my_completion3, my_completion4;
   ASSERT_EQ("", test_data.init());
@@ -1285,7 +1280,6 @@ TEST(LibRadosAioEC, RoundTripAppend) {
 }
 
 TEST(LibRadosAioEC, IsComplete) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1325,7 +1319,6 @@ TEST(LibRadosAioEC, IsComplete) {
 }
 
 TEST(LibRadosAioEC, IsSafe) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1365,7 +1358,6 @@ TEST(LibRadosAioEC, IsSafe) {
 }
 
 TEST(LibRadosAioEC, ReturnValue) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1384,7 +1376,6 @@ TEST(LibRadosAioEC, ReturnValue) {
 }
 
 TEST(LibRadosAioEC, Flush) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1414,7 +1405,6 @@ TEST(LibRadosAioEC, Flush) {
 }
 
 TEST(LibRadosAioEC, FlushAsync) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1453,7 +1443,6 @@ TEST(LibRadosAioEC, FlushAsync) {
 }
 
 TEST(LibRadosAioEC, RoundTripWriteFull) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion, my_completion2, my_completion3;
   ASSERT_EQ("", test_data.init());
@@ -1497,7 +1486,6 @@ TEST(LibRadosAioEC, RoundTripWriteFull) {
 }
 
 TEST(LibRadosAioEC, SimpleStat) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1531,7 +1519,6 @@ TEST(LibRadosAioEC, SimpleStat) {
 
 
 TEST(LibRadosAioEC, SimpleStatNS) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1592,7 +1579,6 @@ TEST(LibRadosAioEC, SimpleStatNS) {
 }
 
 TEST(LibRadosAioEC, StatRemove) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1648,7 +1634,6 @@ TEST(LibRadosAioEC, StatRemove) {
 }
 
 TEST(LibRadosAioEC, ExecuteClass) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   ASSERT_EQ("", test_data.init());
@@ -1680,7 +1665,6 @@ TEST(LibRadosAioEC, ExecuteClass) {
 }
 
 TEST(LibRadosAioEC, MultiWrite) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion, my_completion2, my_completion3;
   ASSERT_EQ("", test_data.init());
diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc
index 9be4afeb2c4a..a1f333edbc88 100644
--- a/src/test/librados/io.cc
+++ b/src/test/librados/io.cc
@@ -270,7 +270,6 @@ TEST_F(LibRadosIo, XattrIter) {
 }
 
 TEST_F(LibRadosIoEC, SimpleWrite) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -279,7 +278,6 @@ TEST_F(LibRadosIoEC, SimpleWrite) {
 }
 
 TEST_F(LibRadosIoEC, RoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -293,7 +291,6 @@ TEST_F(LibRadosIoEC, RoundTrip) {
 }
 
 TEST_F(LibRadosIoEC, OverlappingWriteRoundTrip) {
-  SKIP_IF_CRIMSON();
   int bsize = alignment;
   int dbsize = bsize * 2;
   char *buf = (char *)new char[dbsize];
@@ -316,7 +313,6 @@ TEST_F(LibRadosIoEC, OverlappingWriteRoundTrip) {
 }
 
 TEST_F(LibRadosIoEC, WriteFullRoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[64];
   char buf3[128];
@@ -330,7 +326,6 @@ TEST_F(LibRadosIoEC, WriteFullRoundTrip) {
 }
 
 TEST_F(LibRadosIoEC, AppendRoundTrip) {
-  SKIP_IF_CRIMSON();
   char *buf = (char *)new char[alignment];
   char *buf2 = (char *)new char[alignment];
   char *buf3 = (char *)new char[alignment *2];
@@ -357,7 +352,6 @@ TEST_F(LibRadosIoEC, AppendRoundTrip) {
 }
 
 TEST_F(LibRadosIoEC, TruncTest) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
@@ -371,7 +365,6 @@ TEST_F(LibRadosIoEC, TruncTest) {
 }
 
 TEST_F(LibRadosIoEC, RemoveTest) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
@@ -382,7 +375,6 @@ TEST_F(LibRadosIoEC, RemoveTest) {
 }
 
 TEST_F(LibRadosIoEC, XattrsRoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
@@ -396,7 +388,6 @@ TEST_F(LibRadosIoEC, XattrsRoundTrip) {
 }
 
 TEST_F(LibRadosIoEC, RmXattr) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
@@ -420,7 +411,6 @@ TEST_F(LibRadosIoEC, RmXattr) {
 }
 
 TEST_F(LibRadosIoEC, XattrIter) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";