From: Sage Weil <sage@redhat.com>
Date: Thu, 11 Dec 2014 14:45:42 +0000 (-0800)
Subject: ceph_test_rados_api_watch_notify: use GT macro
X-Git-Tag: v0.91~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=531e8bb7222244d57c751093e0ea243b29a62926;p=ceph.git

ceph_test_rados_api_watch_notify: use GT macro

so we can see the value

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc
index c28eb9f75e6d3..2b5ea37fcf58b 100644
--- a/src/test/librados/watch_notify.cc
+++ b/src/test/librados/watch_notify.cc
@@ -302,7 +302,7 @@ TEST_F(LibRadosWatchNotify, Watch2Timeout) {
 	    rados_watch2(ioctx, notify_oid, &handle,
 			 watch_notify2_test_cb,
 			 watch_notify2_test_errcb, NULL));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
 
   // and now a notify will work.
   ASSERT_EQ(0, rados_notify2(ioctx, notify_oid,
@@ -323,7 +323,7 @@ TEST_F(LibRadosWatchNotify, Watch2Timeout) {
     ASSERT_EQ(0, strncmp("reply", reply_map.begin()->second.c_str(), 5));
   }
   ASSERT_EQ(1u, notify_cookies.size());
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
 
   rados_unwatch2(ioctx, handle);
 }
@@ -342,7 +342,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2) {
       rados_watch2(ioctx, notify_oid, &handle,
 		   watch_notify2_test_cb,
 		   watch_notify2_test_errcb, NULL));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
   char *reply_buf = 0;
   size_t reply_buf_len;
   ASSERT_EQ(0, rados_notify2(ioctx, notify_oid,
@@ -361,7 +361,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2) {
   ASSERT_EQ(1u, notify_cookies.count(handle));
   ASSERT_EQ(5u, reply_map.begin()->second.length());
   ASSERT_EQ(0, strncmp("reply", reply_map.begin()->second.c_str(), 5));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
   rados_buffer_free(reply_buf);
 
   // try it on a non-existent object ... our buffer pointers
@@ -387,7 +387,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2) {
   uint64_t handle;
   WatchNotifyTestCtx2 ctx;
   ASSERT_EQ(0, ioctx.watch(notify_oid, &handle, &ctx));
-  ASSERT_TRUE(ioctx.watch_check(handle) > 0);
+  ASSERT_GT(ioctx.watch_check(handle), 0);
   std::list<obj_watch_t> watches;
   ASSERT_EQ(0, ioctx.list_watchers(notify_oid, &watches));
   ASSERT_EQ(watches.size(), 1u);
@@ -404,7 +404,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2) {
   ASSERT_EQ(5, reply_map.begin()->second.length());
   ASSERT_EQ(0, strncmp("reply", reply_map.begin()->second.c_str(), 5));
   ASSERT_EQ(0, missed_map.size());
-  ASSERT_TRUE(ioctx.watch_check(handle) > 0);
+  ASSERT_GT(ioctx.watch_check(handle), 0);
   ioctx.unwatch(handle);
 }
 
@@ -426,8 +426,8 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Multi) {
       rados_watch2(ioctx, notify_oid, &handle2,
 		   watch_notify2_test_cb,
 		   watch_notify2_test_errcb, NULL));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle1) > 0);
-  ASSERT_TRUE(rados_watch_check(ioctx, handle2) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle1), 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle2), 0);
   ASSERT_NE(handle1, handle2);
   char *reply_buf = 0;
   size_t reply_buf_len;
@@ -448,8 +448,8 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Multi) {
   ASSERT_EQ(1, notify_cookies.count(handle1));
   ASSERT_EQ(1, notify_cookies.count(handle2));
   ASSERT_EQ(0, strncmp("reply", reply_map.begin()->second.c_str(), 5));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle1) > 0);
-  ASSERT_TRUE(rados_watch_check(ioctx, handle2) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle1), 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle2), 0);
   rados_buffer_free(reply_buf);
   rados_unwatch2(ioctx, handle1);
   rados_unwatch2(ioctx, handle2);
@@ -470,7 +470,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Timeout) {
       rados_watch2(ioctx, notify_oid, &handle,
 		   watch_notify2_test_cb,
 		   watch_notify2_test_errcb, NULL));
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
   char *reply_buf = 0;
   size_t reply_buf_len;
   ASSERT_EQ(-ETIMEDOUT, rados_notify2(ioctx, notify_oid,
@@ -497,7 +497,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Timeout) {
 			     "notify", 6, 30000, // 30s
 			     &reply_buf, &reply_buf_len));
   ASSERT_EQ(1u, notify_cookies.size());
-  ASSERT_TRUE(rados_watch_check(ioctx, handle) > 0);
+  ASSERT_GT(rados_watch_check(ioctx, handle), 0);
 
   rados_unwatch2(ioctx, handle);
 }
@@ -515,7 +515,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2Timeout) {
   uint64_t handle;
   WatchNotifyTestCtx2 ctx;
   ASSERT_EQ(0, ioctx.watch(notify_oid, &handle, &ctx));
-  ASSERT_TRUE(ioctx.watch_check(handle) > 0);
+  ASSERT_GT(ioctx.watch_check(handle), 0);
   std::list<obj_watch_t> watches;
   ASSERT_EQ(0, ioctx.list_watchers(notify_oid, &watches));
   ASSERT_EQ(watches.size(), 1u);
@@ -523,7 +523,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2Timeout) {
   bufferlist bl2, bl_reply;
   ASSERT_EQ(-ETIMEDOUT, ioctx.notify(notify_oid, bl2, 1000 /* 1s */,
 				     &bl_reply));
-  ASSERT_TRUE(ioctx.watch_check(handle) > 0);
+  ASSERT_GT(ioctx.watch_check(handle), 0);
   ioctx.unwatch(handle);
 }