test: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
Anthony-Mai · Nov 1, 2019 · 00428e2 · 00428e2
1 parent 3f5afc9
commit 00428e2
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 160 deletions.
diff --git a/src/test/cls_hello/test_cls_hello.cc b/src/test/cls_hello/test_cls_hello.cc
@@ -106,7 +106,7 @@ TEST(ClsHello, WriteReturnData) {
   librados::AioCompletion *completion = cluster.aio_create_completion();
   ASSERT_EQ(0, ioctx.aio_operate("foo", completion, &o,
 				 librados::OPERATION_RETURNVEC));
-  completion->wait_for_safe();
+  completion->wait_for_complete();
   ASSERT_EQ(42, completion->get_return_value());
   ASSERT_EQ(42, rval);
   out.hexdump(std::cout);
@@ -122,7 +122,7 @@ TEST(ClsHello, WriteReturnData) {
     librados::AioCompletion *completion = cluster.aio_create_completion();
     ASSERT_EQ(0, ioctx.aio_operate("foo", completion, &o,
 				   librados::OPERATION_RETURNVEC));
-    completion->wait_for_safe();
+    completion->wait_for_complete();
     ASSERT_EQ(-EOVERFLOW, completion->get_return_value());
     ASSERT_EQ(-EOVERFLOW, rval);
     ASSERT_EQ("", std::string(out.c_str(), out.length()));

diff --git a/src/test/librados/aio_cxx.cc b/src/test/librados/aio_cxx.cc
@@ -108,7 +108,7 @@ TEST(LibRadosAio, PoolQuotaPP) {
     ASSERT_EQ(0, ioctx.aio_operate(
 	"foo" + stringify(n), completion, &op,
 	librados::OPERATION_FULL_TRY));
-    completion->wait_for_safe();
+    completion->wait_for_complete();
     int r = completion->get_return_value();
     completion->release();
     if (r == -EDQUOT)
@@ -190,7 +190,7 @@ TEST(LibRadosAio, WaitForSafePP) {
   ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo",
 			       my_completion, bl1, sizeof(buf), 0));
   TestAlarm alarm;
-  ASSERT_EQ(0, my_completion->wait_for_safe());
+  ASSERT_EQ(0, my_completion->wait_for_complete());
   ASSERT_EQ(0, my_completion->get_return_value());
   delete my_completion;
 }
@@ -256,7 +256,6 @@ TEST(LibRadosAio, RoundTripPP2) {
 			      my_completion2, &bl2, sizeof(buf), 0));
   {
     TestAlarm alarm;
-    ASSERT_EQ(0, my_completion2->wait_for_safe());
     ASSERT_EQ(0, my_completion2->wait_for_complete());
   }
   ASSERT_EQ((int)sizeof(buf), my_completion2->get_return_value());
@@ -736,7 +735,6 @@ TEST(LibRadosAio, FlushAsyncPP) {
   {
       TestAlarm alarm;
       ASSERT_EQ(0, flush_completion->wait_for_complete());
-      ASSERT_EQ(0, flush_completion->wait_for_safe());
   }
   ASSERT_EQ(1, my_completion->is_complete());
   ASSERT_EQ(1, my_completion->is_safe());
@@ -1490,7 +1488,7 @@ TEST(LibRadosAioEC, WaitForSafePP) {
   ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo",
 			       my_completion, bl1, sizeof(buf), 0));
   TestAlarm alarm;
-  ASSERT_EQ(0, my_completion->wait_for_safe());
+  ASSERT_EQ(0, my_completion->wait_for_complete());
   ASSERT_EQ(0, my_completion->get_return_value());
   delete my_completion;
 }
@@ -1556,7 +1554,6 @@ TEST(LibRadosAioEC, RoundTripPP2) {
 			      my_completion2, &bl2, sizeof(buf), 0));
   {
     TestAlarm alarm;
-    ASSERT_EQ(0, my_completion2->wait_for_safe());
     ASSERT_EQ(0, my_completion2->wait_for_complete());
   }
   ASSERT_EQ((int)sizeof(buf), my_completion2->get_return_value());
@@ -1943,7 +1940,6 @@ TEST(LibRadosAioEC, FlushAsyncPP) {
   {
       TestAlarm alarm;
       ASSERT_EQ(0, flush_completion->wait_for_complete());
-      ASSERT_EQ(0, flush_completion->wait_for_safe());
   }
   ASSERT_EQ(1, my_completion->is_complete());
   ASSERT_EQ(1, my_completion->is_safe());

diff --git a/src/test/librados/testcase_cxx.cc b/src/test/librados/testcase_cxx.cc
@@ -238,7 +238,7 @@ void RadosTestPP::cleanup_namespace(librados::IoCtx ioctx, std::string ns)
       auto sg = make_scope_guard([&] { completion->release(); });
       ASSERT_EQ(0, ioctx.aio_operate(it->get_oid(), completion, &op,
 				     librados::OPERATION_IGNORE_CACHE));
-      completion->wait_for_safe();
+      completion->wait_for_complete();
       if (completion->get_return_value() == -ENOENT) {
 	++got_enoent;
 	std::cout << " got ENOENT removing " << it->get_oid()