import quincy beta 17.1.0

[ceph.git] / ceph / src / test / librados / list.cc

diff --git a/ceph/src/test/librados/list.cc b/ceph/src/test/librados/list.cc
index 829890c1ad9058c955bea0af3eab8ce882048de5..930e6b9eb8ea96ad4fb833c76d398d7bb5522944 100644 (file)
--- a/ceph/src/test/librados/list.cc
+++ b/ceph/src/test/librados/list.cc
@@ -15,6 +15,7 @@
 #include <string>
 #include <stdexcept>
 
+using namespace std;
 using namespace librados;
 
 typedef RadosTestNSCleanup LibRadosList;
@@ -480,8 +481,12 @@ TEST_F(LibRadosList, EnumerateObjectsSplit) {
 
   // Ensure a non-power-of-two PG count to avoid only
   // touching the easy path.
-  ASSERT_TRUE(set_pg_num(&s_cluster, pool_name, 11).empty());
-  ASSERT_TRUE(set_pgp_num(&s_cluster, pool_name, 11).empty());
+  if (auto error = set_pg_num(&s_cluster, pool_name, 11); !error.empty()) {
+    GTEST_FAIL() << error;
+  }
+  if (auto error = set_pgp_num(&s_cluster, pool_name, 11); !error.empty()) {
+    GTEST_FAIL() << error;
+  }
 
   rados_object_list_cursor begin = rados_object_list_begin(ioctx);
   rados_object_list_cursor end = rados_object_list_end(ioctx);