From: Wei Wang <lightmelodies@outlook.com>
Date: Thu, 11 Aug 2022 12:25:51 +0000 (+0000)
Subject: librados: fix stat test cases
X-Git-Tag: v18.0.0~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ae37ee15af003e1c76759f6042d3cdcb0aa2c06;p=ceph.git

librados: fix stat test cases

Signed-off-by: Wei Wang <lightmelodies@outlook.com>
---

diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc
index bdcca640304c..a8bad0748944 100644
--- a/src/test/librados/c_read_operations.cc
+++ b/src/test/librados/c_read_operations.cc
@@ -578,7 +578,7 @@ TEST_F(CReadOpsTest, ExecUserBuf) {
 TEST_F(CReadOpsTest, Stat) {
   rados_read_op_t op = rados_create_read_op();
   uint64_t size = 1;
-  int rval;
+  int rval = 0;
   rados_read_op_stat(op, &size, NULL, &rval);
   EXPECT_EQ(-ENOENT, rados_read_op_operate(op, ioctx, obj, 0));
   EXPECT_EQ(-EIO, rval);
@@ -588,17 +588,16 @@ TEST_F(CReadOpsTest, Stat) {
   time_t ts = 1457129052;
   rados_write_op_t wop = rados_create_write_op();
   rados_write_op_write(wop, data, len, 0);
-  EXPECT_EQ(0, rados_write_op_operate(wop, ioctx, obj, &ts, 0));
+  ASSERT_EQ(0, rados_write_op_operate(wop, ioctx, obj, &ts, 0));
   rados_release_write_op(wop);
 
   time_t ts2;
   op = rados_create_read_op();
   rados_read_op_stat(op, &size, &ts2, &rval);
-  EXPECT_EQ(0, rados_read_op_operate(op, ioctx, obj, 0));
+  ASSERT_EQ(0, rados_read_op_operate(op, ioctx, obj, 0));
   EXPECT_EQ(0, rval);
   EXPECT_EQ(len, size);
   EXPECT_EQ(ts2, ts);
-
   rados_release_read_op(op);
 
   op = rados_create_read_op();
@@ -617,7 +616,7 @@ TEST_F(CReadOpsTest, Stat) {
 TEST_F(CReadOpsTest, Stat2) {
   rados_read_op_t op = rados_create_read_op();
   uint64_t size = 1;
-  int rval;
+  int rval = 0;
   rados_read_op_stat2(op, &size, NULL, &rval);
   EXPECT_EQ(-ENOENT, rados_read_op_operate(op, ioctx, obj, 0));
   EXPECT_EQ(-EIO, rval);
@@ -629,18 +628,17 @@ TEST_F(CReadOpsTest, Stat2) {
   ts.tv_nsec = 123456789;
   rados_write_op_t wop = rados_create_write_op();
   rados_write_op_write(wop, data, len, 0);
-  EXPECT_EQ(0, rados_write_op_operate2(wop, ioctx, obj, &ts, 0));
+  ASSERT_EQ(0, rados_write_op_operate2(wop, ioctx, obj, &ts, 0));
   rados_release_write_op(wop);
 
-  struct timespec ts2;
+  struct timespec ts2 = {};
   op = rados_create_read_op();
   rados_read_op_stat2(op, &size, &ts2, &rval);
-  EXPECT_EQ(0, rados_read_op_operate(op, ioctx, obj, 0));
+  ASSERT_EQ(0, rados_read_op_operate(op, ioctx, obj, 0));
   EXPECT_EQ(0, rval);
   EXPECT_EQ(len, size);
   EXPECT_EQ(ts2.tv_sec, ts.tv_sec);
   EXPECT_EQ(ts2.tv_nsec, ts.tv_nsec);
-
   rados_release_read_op(op);
 
   op = rados_create_read_op();
diff --git a/src/test/librados/stat.cc b/src/test/librados/stat.cc
index cb035cbf61c3..f66efeaeb973 100644
--- a/src/test/librados/stat.cc
+++ b/src/test/librados/stat.cc
@@ -15,8 +15,8 @@ TEST_F(LibRadosStat, Stat) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  uint64_t size;
-  time_t mtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
   ASSERT_EQ(sizeof(buf), size);
   ASSERT_EQ(-ENOENT, rados_stat(ioctx, "nonexistent", &size, &mtime));
@@ -33,13 +33,13 @@ TEST_F(LibRadosStat, Stat2) {
   ASSERT_EQ(0, rados_write_op_operate2(op, ioctx, "foo", &ts, 0));
   rados_release_write_op(op);
 
-  uint64_t size;
-  time_t mtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
   ASSERT_EQ(sizeof(buf), size);
   ASSERT_EQ(mtime, ts.tv_sec);
 
-  struct timespec ts2;
+  struct timespec ts2 = {};
   ASSERT_EQ(0, rados_stat2(ioctx, "foo", &size, &ts2));
   ASSERT_EQ(sizeof(buf), size);
   ASSERT_EQ(ts2.tv_sec, ts.tv_sec);
@@ -60,8 +60,8 @@ TEST_F(LibRadosStat, StatNS) {
   rados_ioctx_set_namespace(ioctx, "nspace");
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
 
-  uint64_t size;
-  time_t mtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   rados_ioctx_set_namespace(ioctx, "");
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
   ASSERT_EQ(sizeof(buf), size);
@@ -96,8 +96,8 @@ TEST_F(LibRadosStatEC, Stat) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  uint64_t size;
-  time_t mtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
   ASSERT_EQ(sizeof(buf), size);
   ASSERT_EQ(-ENOENT, rados_stat(ioctx, "nonexistent", &size, &mtime));
@@ -115,8 +115,8 @@ TEST_F(LibRadosStatEC, StatNS) {
   rados_ioctx_set_namespace(ioctx, "nspace");
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
 
-  uint64_t size;
-  time_t mtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   rados_ioctx_set_namespace(ioctx, "");
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
   ASSERT_EQ(sizeof(buf), size);
diff --git a/src/test/libradosstriper/io.cc b/src/test/libradosstriper/io.cc
index a651320e739f..88f69400e719 100644
--- a/src/test/libradosstriper/io.cc
+++ b/src/test/libradosstriper/io.cc
@@ -42,25 +42,25 @@ TEST_F(StriperTestPP, SimpleWriteFullPP) {
 }
 
 TEST_F(StriperTest, Stat) {
-  uint64_t psize;
-  time_t pmtime;
+  uint64_t size = 0;
+  time_t mtime = 0;
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_striper_write(striper, "Stat", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_striper_stat(striper, "Stat", &psize, &pmtime));
-  ASSERT_EQ(psize, sizeof(buf));
-  ASSERT_EQ(-ENOENT, rados_striper_stat(striper, "nonexistent", &psize, &pmtime));
+  ASSERT_EQ(0, rados_striper_stat(striper, "Stat", &size, &mtime));
+  ASSERT_EQ(size, sizeof(buf));
+  ASSERT_EQ(-ENOENT, rados_striper_stat(striper, "nonexistent", &size, &mtime));
 }
 
 TEST_F(StriperTest, Stat2) {
-  uint64_t psize;
-  struct timespec pmtime;
+  uint64_t size = 0;
+  struct timespec mtime = {};
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_striper_write(striper, "Stat2", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_striper_stat2(striper, "Stat2", &psize, &pmtime));
-  ASSERT_EQ(psize, sizeof(buf));
-  ASSERT_EQ(-ENOENT, rados_striper_stat2(striper, "nonexistent", &psize, &pmtime));
+  ASSERT_EQ(0, rados_striper_stat2(striper, "Stat2", &size, &mtime));
+  ASSERT_EQ(size, sizeof(buf));
+  ASSERT_EQ(-ENOENT, rados_striper_stat2(striper, "nonexistent", &size, &mtime));
 }
 
 TEST_F(StriperTestPP, StatPP) {
@@ -69,11 +69,11 @@ TEST_F(StriperTestPP, StatPP) {
   bufferlist bl;
   bl.append(buf, sizeof(buf));
   ASSERT_EQ(0, striper.write("Statpp", bl, sizeof(buf), 0));
-  uint64_t psize;
-  time_t pmtime;
-  ASSERT_EQ(0, striper.stat("Statpp", &psize, &pmtime));
-  ASSERT_EQ(psize, sizeof(buf));
-  ASSERT_EQ(-ENOENT, striper.stat("nonexistent", &psize, &pmtime));
+  uint64_t size = 0;
+  time_t mtime = 0;
+  ASSERT_EQ(0, striper.stat("Statpp", &size, &mtime));
+  ASSERT_EQ(size, sizeof(buf));
+  ASSERT_EQ(-ENOENT, striper.stat("nonexistent", &size, &mtime));
 }
 
 TEST_F(StriperTestPP, Stat2PP) {
@@ -82,11 +82,11 @@ TEST_F(StriperTestPP, Stat2PP) {
   bufferlist bl;
   bl.append(buf, sizeof(buf));
   ASSERT_EQ(0, striper.write("Stat2pp", bl, sizeof(buf), 0));
-  uint64_t psize;
-  struct timespec pmtime;
-  ASSERT_EQ(0, striper.stat2("Stat2pp", &psize, &pmtime));
-  ASSERT_EQ(psize, sizeof(buf));
-  ASSERT_EQ(-ENOENT, striper.stat2("nonexistent", &psize, &pmtime));
+  uint64_t size = 0;
+  struct timespec mtime = {};
+  ASSERT_EQ(0, striper.stat2("Stat2pp", &size, &mtime));
+  ASSERT_EQ(size, sizeof(buf));
+  ASSERT_EQ(-ENOENT, striper.stat2("nonexistent", &size, &mtime));
 }
 
 TEST_F(StriperTest, RoundTrip) {