test/librbd: fix compiler -Wsign-compare warnings

Signed-off-by: Mykola Golub <mgolub@suse.com>

diff --git a/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc b/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
index 0c6659834b9fce68da9834649deedcd22d707d56..4477fa0f4c1ffee8e047cb3417704d0445add4cf 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
@@ -212,7 +212,7 @@ TEST_F(TestMockDeepCopySetHeadRequest, SetParentOverlap) {
                                 mock_image_ctx.parent_md.spec, 123, &ctx);
   request->send();
   ASSERT_EQ(0, ctx.wait());
-  ASSERT_EQ(123, mock_image_ctx.parent_md.overlap);
+  ASSERT_EQ(123U, mock_image_ctx.parent_md.overlap);
 }
 
 TEST_F(TestMockDeepCopySetHeadRequest, SetParentError) {

diff --git a/src/test/librbd/image/test_mock_ListWatchersRequest.cc b/src/test/librbd/image/test_mock_ListWatchersRequest.cc
index 8090379b480748890c674177664674dbbba2f37a..f2915925a72be494e02cd58a4b54cfb66b29d4a4 100644 (file)
--- a/src/test/librbd/image/test_mock_ListWatchersRequest.cc
+++ b/src/test/librbd/image/test_mock_ListWatchersRequest.cc
@@ -154,11 +154,11 @@ TEST_F(TestMockListWatchersRequest, Success) {
 
   auto w = watchers.begin();
   ASSERT_STREQ("a", w->addr);
-  ASSERT_EQ(123, w->cookie);
+  ASSERT_EQ(123U, w->cookie);
 
   w++;
   ASSERT_STREQ("b", w->addr);
-  ASSERT_EQ(456, w->cookie);
+  ASSERT_EQ(456U, w->cookie);
 }
 
 TEST_F(TestMockListWatchersRequest, FilterOutMyInstance) {
@@ -183,7 +183,7 @@ TEST_F(TestMockListWatchersRequest, FilterOutMyInstance) {
   ASSERT_EQ(1U, watchers.size());
 
   ASSERT_STREQ("b", watchers.begin()->addr);
-  ASSERT_EQ(456, watchers.begin()->cookie);
+  ASSERT_EQ(456U, watchers.begin()->cookie);
 }
 
 TEST_F(TestMockListWatchersRequest, FilterOutMirrorInstance) {
@@ -213,7 +213,7 @@ TEST_F(TestMockListWatchersRequest, FilterOutMirrorInstance) {
   ASSERT_EQ(1U, watchers.size());
 
   ASSERT_STREQ("a", watchers.begin()->addr);
-  ASSERT_EQ(123, watchers.begin()->cookie);
+  ASSERT_EQ(123U, watchers.begin()->cookie);
 }
 
 } // namespace image

diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc
index 5e01b5c84745c200d87617933b8bfabb0b5e7eac..e0e3f3275e309f4e1db5d9bbcaa0db643cdbd63f 100644 (file)
--- a/src/test/librbd/image/test_mock_RefreshRequest.cc
+++ b/src/test/librbd/image/test_mock_RefreshRequest.cc
@@ -769,7 +769,7 @@ TEST_F(TestMockImageRefreshRequest, SuccessOpFeatures) {
   req->send();
 
   ASSERT_EQ(0, ctx.wait());
-  ASSERT_EQ(4096, mock_image_ctx.op_features);
+  ASSERT_EQ(4096U, mock_image_ctx.op_features);
   ASSERT_TRUE(mock_image_ctx.operations_disabled);
 }
 

diff --git a/src/test/librbd/test_Groups.cc b/src/test/librbd/test_Groups.cc
index 4836a97cc45b369a62eb4a14eac4b6a17fdbdbbd..160601758a2a6b678a9d7cb9b3d8122cf63af323 100644 (file)
--- a/src/test/librbd/test_Groups.cc
+++ b/src/test/librbd/test_Groups.cc
@@ -34,7 +34,7 @@ TEST_F(TestGroup, group_create)
   ASSERT_EQ(strlen("mygroup") + 1, size);
 
   char groups[80];
-  ASSERT_EQ(static_cast<size_t>(strlen("mygroup") + 1),
+  ASSERT_EQ(static_cast<int>(strlen("mygroup") + 1),
            rbd_group_list(ioctx, groups, &size));
   ASSERT_STREQ("mygroup", groups);
 

diff --git a/src/test/librbd/test_Migration.cc b/src/test/librbd/test_Migration.cc
index 9cebb175ecd72137fcd8e7b7417f37c8851837f5..e1750cfa8867521d7ff016e8623eb3a1e8a69429 100644 (file)
--- a/src/test/librbd/test_Migration.cc
+++ b/src/test/librbd/test_Migration.cc
@@ -229,11 +229,12 @@ struct TestMigration : public TestFixture {
 
     bufferlist ref_bl;
     ref_bl.append(std::string(len, c));
-    ASSERT_EQ(len, m_ref_ictx->io_work_queue->write(off, len, std::move(ref_bl),
-                                                    0));
+    ASSERT_EQ(static_cast<ssize_t>(len),
+              m_ref_ictx->io_work_queue->write(off, len, std::move(ref_bl), 0));
     bufferlist bl;
     bl.append(std::string(len, c));
-    ASSERT_EQ(len, m_ictx->io_work_queue->write(off, len, std::move(bl), 0));
+    ASSERT_EQ(static_cast<ssize_t>(len),
+              m_ictx->io_work_queue->write(off, len, std::move(bl), 0));
   }
 
   void discard(uint64_t off, uint64_t len) {

diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index 950e008b306a26f9dd8384e974ce6eaddcc20c8a..6f2d3d03a1fb4254d987b97929e28cab05b3efed 100644 (file)
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -6656,13 +6656,13 @@ TEST_F(TestLibRBD, TestListWatchers) {
   // No watchers
   ASSERT_EQ(0, rbd.open_read_only(ioctx, image, name.c_str(), nullptr));
   ASSERT_EQ(0, image.list_watchers(watchers));
-  ASSERT_EQ(0, watchers.size());
+  ASSERT_EQ(0U, watchers.size());
   ASSERT_EQ(0, image.close());
 
   // One watcher
   ASSERT_EQ(0, rbd.open(ioctx, image, name.c_str(), nullptr));
   ASSERT_EQ(0, image.list_watchers(watchers));
-  ASSERT_EQ(1, watchers.size());
+  ASSERT_EQ(1U, watchers.size());
   ASSERT_EQ(0, image.close());
 }
 

diff --git a/src/test/librbd/test_mock_ManagedLock.cc b/src/test/librbd/test_mock_ManagedLock.cc
index 9b4381878010cddd3bb3bbec5247859e6fdb101c..4a911ed9c183d4ee83a54bd45173422c3d538bcd 100644 (file)
--- a/src/test/librbd/test_mock_ManagedLock.cc
+++ b/src/test/librbd/test_mock_ManagedLock.cc
@@ -546,7 +546,7 @@ TEST_F(TestMockManagedLock, ReacquireWithSameCookie) {
   C_SaferCond reacquire_ctx;
   expect_post_reacquired_lock_handler(*mock_image_ctx.image_watcher, managed_lock, client_id);
   managed_lock.reacquire_lock(&reacquire_ctx);
-  ASSERT_LT(0, client_id);
+  ASSERT_LT(0U, client_id);
   ASSERT_TRUE(is_lock_owner(managed_lock));
 
   MockReleaseRequest shutdown_release;