From 0601b5f9080e254bc2a59279eb5fc4c430cca9ec Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Nov 2014 16:38:18 -0800 Subject: [PATCH] ceph_test_rados_watch_notify: fix signed/unsigned warnings Signed-off-by: Sage Weil --- src/test/librados/watch_notify.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc index cfe5c777ec7e0..576e827a0db5f 100644 --- a/src/test/librados/watch_notify.cc +++ b/src/test/librados/watch_notify.cc @@ -147,8 +147,8 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Test) { std::multimap reply_map; bufferlist::iterator reply_p = reply.begin(); ::decode(reply_map, reply_p); - ASSERT_EQ(1, reply_map.size()); - ASSERT_EQ(1, notify_cookies.size()); + ASSERT_EQ(1u, reply_map.size()); + ASSERT_EQ(1u, notify_cookies.size()); ASSERT_EQ(1, notify_cookies.count(handle)); ASSERT_EQ(5, reply_map.begin()->second.length()); ASSERT_EQ(0, strncmp("reply", reply_map.begin()->second.c_str(), 5)); @@ -184,9 +184,9 @@ TEST_F(LibRadosWatchNotify, WatchNotify2MultiTest) { std::multimap reply_map; bufferlist::iterator reply_p = reply.begin(); ::decode(reply_map, reply_p); - ASSERT_EQ(2, reply_map.size()); + ASSERT_EQ(2u, reply_map.size()); ASSERT_EQ(5, reply_map.begin()->second.length()); - ASSERT_EQ(2, notify_cookies.size()); + ASSERT_EQ(2u, notify_cookies.size()); 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)); @@ -214,7 +214,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2TimeoutTest) { ASSERT_EQ(-ETIMEDOUT, rados_notify2(ioctx, notify_oid, "notify", 6, 1000, // 1s &reply_buf, &reply_buf_len)); - ASSERT_EQ(1, notify_cookies.size()); + ASSERT_EQ(1u, notify_cookies.size()); int wait = 10; while (!notify_failed && --wait) sleep(1); @@ -273,7 +273,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2TestPP) { bufferlist::iterator p = bl_reply.begin(); std::multimap reply_map; ::decode(reply_map, p); - ASSERT_EQ(1, notify_cookies.size()); + ASSERT_EQ(1u, notify_cookies.size()); ASSERT_EQ(1, notify_cookies.count(handle)); ASSERT_EQ(1u, reply_map.size()); ASSERT_EQ(5, reply_map.begin()->second.length()); @@ -298,7 +298,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2TimeoutTestPP) { std::list watches; ASSERT_EQ(0, ioctx.list_watchers(notify_oid, &watches)); ASSERT_EQ(watches.size(), 1u); - ASSERT_EQ(0, notify_cookies.size()); + ASSERT_EQ(0u, notify_cookies.size()); bufferlist bl2, bl_reply; ASSERT_EQ(-ETIMEDOUT, ioctx.notify2(notify_oid, bl2, 1000 /* 1s */, &bl_reply)); int wait = 10; -- 2.39.5