From 18a75f1184461f9272623f00276b838c3d12c435 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 10 Feb 2016 13:44:51 -0500 Subject: [PATCH] test: use StrEq for C-style string matching If compiler optimizations are enabled, strings will be copied, resulting in different memory addresses. Signed-off-by: Jason Dillaman --- .../test_mock_AcquireRequest.cc | 9 ++++--- .../test_mock_ReleaseRequest.cc | 3 ++- .../librbd/image/test_mock_RefreshRequest.cc | 25 ++++++++++--------- .../object_map/test_mock_InvalidateRequest.cc | 17 +++++++------ .../object_map/test_mock_LockRequest.cc | 7 +++--- .../object_map/test_mock_RefreshRequest.cc | 5 ++-- .../object_map/test_mock_ResizeRequest.cc | 11 ++++---- .../test_mock_SnapshotCreateRequest.cc | 9 ++++--- .../test_mock_SnapshotRemoveRequest.cc | 15 +++++------ .../test_mock_SnapshotRollbackRequest.cc | 7 +++--- .../object_map/test_mock_UnlockRequest.cc | 3 ++- .../object_map/test_mock_UpdateRequest.cc | 11 ++++---- .../operation/test_mock_ResizeRequest.cc | 3 ++- .../test_mock_SnapshotCreateRequest.cc | 7 +++--- .../test_mock_SnapshotProtectRequest.cc | 5 ++-- .../test_mock_SnapshotRemoveRequest.cc | 9 ++++--- .../test_mock_SnapshotUnprotectRequest.cc | 7 +++--- src/test/librbd/test_mock_fixture.cc | 3 ++- 18 files changed, 87 insertions(+), 69 deletions(-) diff --git a/src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc b/src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc index 0d370ac1d957..60b4c5a5e6a4 100644 --- a/src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc @@ -28,6 +28,7 @@ using ::testing::DoAll; using ::testing::InSequence; using ::testing::Return; using ::testing::SetArgPointee; +using ::testing::StrEq; using ::testing::WithArg; static const std::string TEST_COOKIE("auto 123"); @@ -45,7 +46,7 @@ public: void expect_lock(MockImageCtx &mock_image_ctx, int r) { EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", "lock", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("lock"), _, _, _)) .WillOnce(Return(r)); } @@ -86,8 +87,8 @@ public: const std::string &lock_tag, ClsLockType lock_type) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", - "get_info", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("lock"), + StrEq("get_info"), _, _, _)); if (r < 0 && r != -ENOENT) { expect.WillOnce(Return(r)); } else { @@ -138,7 +139,7 @@ public: void expect_break_lock(MockImageCtx &mock_image_ctx, int r) { EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", "break_lock", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("break_lock"), _, _, _)) .WillOnce(Return(r)); } diff --git a/src/test/librbd/exclusive_lock/test_mock_ReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_ReleaseRequest.cc index 925d1f2171f8..eb42feb715ff 100644 --- a/src/test/librbd/exclusive_lock/test_mock_ReleaseRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_ReleaseRequest.cc @@ -22,6 +22,7 @@ namespace exclusive_lock { using ::testing::_; using ::testing::InSequence; using ::testing::Return; +using ::testing::StrEq; static const std::string TEST_COOKIE("auto 123"); @@ -60,7 +61,7 @@ public: void expect_unlock(MockImageCtx &mock_image_ctx, int r) { EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", "unlock", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("unlock"), _, _, _)) .WillOnce(Return(r)); } diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc index f5ee743d1c57..e362986ac632 100644 --- a/src/test/librbd/image/test_mock_RefreshRequest.cc +++ b/src/test/librbd/image/test_mock_RefreshRequest.cc @@ -88,6 +88,7 @@ using ::testing::DoDefault; using ::testing::InSequence; using ::testing::Return; using ::testing::WithArg; +using ::testing::StrEq; class TestMockImageRefreshRequest : public TestMockFixture { public: @@ -114,7 +115,7 @@ public: void expect_v1_get_snapshots(MockRefreshImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "snap_list", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("snap_list"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { @@ -124,7 +125,7 @@ public: void expect_v1_get_locks(MockRefreshImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", "get_info", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("get_info"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { @@ -134,29 +135,29 @@ public: void expect_get_mutable_metadata(MockRefreshImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_size", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_size"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { expect.WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_features", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_features"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_snapcontext", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_snapcontext"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_parent", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_parent"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "lock", "get_info", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("get_info"), _, _, _)) .WillOnce(DoDefault()); } } void expect_get_flags(MockRefreshImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_flags", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_flags"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { @@ -166,19 +167,19 @@ public: void expect_get_snapshots(MockRefreshImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_snapshot_name", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_snapshot_name"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { expect.WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_size", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_size"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_parent", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_parent"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "get_protection_status", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("get_protection_status"), _, _, _)) .WillOnce(DoDefault()); } } diff --git a/src/test/librbd/object_map/test_mock_InvalidateRequest.cc b/src/test/librbd/object_map/test_mock_InvalidateRequest.cc index 9f20a4799dc8..4f3831cf0595 100644 --- a/src/test/librbd/object_map/test_mock_InvalidateRequest.cc +++ b/src/test/librbd/object_map/test_mock_InvalidateRequest.cc @@ -15,6 +15,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapInvalidateRequest : public TestMockFixture { public: @@ -31,7 +32,7 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesInMemoryFlag) { AsyncRequest<> *request = new InvalidateRequest<>(*ictx, CEPH_NOSNAP, false, &cond_ctx); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .Times(0); { @@ -55,10 +56,10 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesHeadOnDiskFlag) { AsyncRequest<> *request = new InvalidateRequest<>(*ictx, CEPH_NOSNAP, false, &cond_ctx); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); { @@ -85,10 +86,10 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesSnapOnDiskFlag) { &cond_ctx); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .Times(0); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); { @@ -109,7 +110,7 @@ TEST_F(TestMockObjectMapInvalidateRequest, SkipOnDiskUpdateWithoutLock) { AsyncRequest<> *request = new InvalidateRequest<>(*ictx, CEPH_NOSNAP, false, &cond_ctx); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .Times(0); { @@ -133,10 +134,10 @@ TEST_F(TestMockObjectMapInvalidateRequest, IgnoresOnDiskUpdateFailure) { AsyncRequest<> *request = new InvalidateRequest<>(*ictx, CEPH_NOSNAP, false, &cond_ctx); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(Return(-EINVAL)); { diff --git a/src/test/librbd/object_map/test_mock_LockRequest.cc b/src/test/librbd/object_map/test_mock_LockRequest.cc index e7a62fd3c663..0ee782bce133 100644 --- a/src/test/librbd/object_map/test_mock_LockRequest.cc +++ b/src/test/librbd/object_map/test_mock_LockRequest.cc @@ -19,6 +19,7 @@ using ::testing::_; using ::testing::DoAll; using ::testing::InSequence; using ::testing::Return; +using ::testing::StrEq; using ::testing::WithArg; class TestMockObjectMapLockRequest : public TestMockFixture { @@ -28,14 +29,14 @@ public: void expect_lock(MockImageCtx &mock_image_ctx, int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, CEPH_NOSNAP)); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "lock", "lock", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("lock"), _, _, _)) .WillOnce(Return(r)); } void expect_get_lock_info(MockImageCtx &mock_image_ctx, int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, CEPH_NOSNAP)); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "lock", "get_info", _, _, _)); + exec(oid, _, StrEq("lock"), StrEq("get_info"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { @@ -60,7 +61,7 @@ public: void expect_break_lock(MockImageCtx &mock_image_ctx, int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, CEPH_NOSNAP)); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "lock", "break_lock", _, _, _)); + exec(oid, _, StrEq("lock"), StrEq("break_lock"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { diff --git a/src/test/librbd/object_map/test_mock_RefreshRequest.cc b/src/test/librbd/object_map/test_mock_RefreshRequest.cc index 9daa18c0bfc7..0dfbb4c07d6f 100644 --- a/src/test/librbd/object_map/test_mock_RefreshRequest.cc +++ b/src/test/librbd/object_map/test_mock_RefreshRequest.cc @@ -65,6 +65,7 @@ using ::testing::DoAll; using ::testing::DoDefault; using ::testing::InSequence; using ::testing::Return; +using ::testing::StrEq; using ::testing::WithArg; class TestMockObjectMapRefreshRequest : public TestMockFixture { @@ -87,7 +88,7 @@ public: int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, snap_id)); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "rbd", "object_map_load", _, _, _)); + exec(oid, _, StrEq("rbd"), StrEq("object_map_load"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { @@ -125,7 +126,7 @@ public: uint64_t num_objects, int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, TEST_SNAP_ID)); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "rbd", "object_map_resize", _, _, _)); + exec(oid, _, StrEq("rbd"), StrEq("object_map_resize"), _, _, _)); expect.WillOnce(Return(r)); } diff --git a/src/test/librbd/object_map/test_mock_ResizeRequest.cc b/src/test/librbd/object_map/test_mock_ResizeRequest.cc index f21d645f81b3..42007d34487a 100644 --- a/src/test/librbd/object_map/test_mock_ResizeRequest.cc +++ b/src/test/librbd/object_map/test_mock_ResizeRequest.cc @@ -17,6 +17,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapResizeRequest : public TestMockFixture { public: @@ -24,26 +25,26 @@ public: std::string oid(ObjectMap::object_map_name(ictx->id, snap_id)); if (snap_id == CEPH_NOSNAP) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); } if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_resize", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_resize"), _, _, _)) .WillOnce(Return(r)); } else { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_resize", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_resize"), _, _, _)) .WillOnce(DoDefault()); } } void expect_invalidate(librbd::ImageCtx *ictx) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)).Times(0); + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)).Times(0); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); } }; diff --git a/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc index e76c1927de2d..3dd62989f297 100644 --- a/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc +++ b/src/test/librbd/object_map/test_mock_SnapshotCreateRequest.cc @@ -17,6 +17,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapSnapshotCreateRequest : public TestMockFixture { public: @@ -57,21 +58,21 @@ public: std::string oid(ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP)); if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(Return(r)); } else { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_snap_add", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_snap_add"), _, _, _)) .WillOnce(DoDefault()); } } void expect_invalidate(librbd::ImageCtx *ictx) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); } }; diff --git a/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc index a29699e86fdf..e7b438d1b78d 100644 --- a/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc +++ b/src/test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc @@ -18,6 +18,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapSnapshotRemoveRequest : public TestMockFixture { public: @@ -25,11 +26,11 @@ public: std::string snap_oid(ObjectMap::object_map_name(ictx->id, snap_id)); if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(snap_oid, _, "rbd", "object_map_load", _, _, _)) + exec(snap_oid, _, StrEq("rbd"), StrEq("object_map_load"), _, _, _)) .WillOnce(Return(r)); } else { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(snap_oid, _, "rbd", "object_map_load", _, _, _)) + exec(snap_oid, _, StrEq("rbd"), StrEq("object_map_load"), _, _, _)) .WillOnce(DoDefault()); } } @@ -38,14 +39,14 @@ public: std::string oid(ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP)); if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(Return(r)); } else { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_snap_remove", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_snap_remove"), _, _, _)) .WillOnce(DoDefault()); } } @@ -63,10 +64,10 @@ public: void expect_invalidate(librbd::ImageCtx *ictx) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .Times(0); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); } }; diff --git a/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc b/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc index 2465ffd5f268..51fc932c0b07 100644 --- a/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc +++ b/src/test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc @@ -17,6 +17,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapSnapshotRollbackRequest : public TestMockFixture { public: @@ -35,7 +36,7 @@ public: void expect_write_map(librbd::ImageCtx *ictx, int r) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), exec(ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP), _, - "lock", "assert_locked", _, _, _)) + StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), @@ -52,10 +53,10 @@ public: void expect_invalidate(librbd::ImageCtx *ictx, uint32_t times) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .Times(0); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .Times(times) .WillRepeatedly(DoDefault()); } diff --git a/src/test/librbd/object_map/test_mock_UnlockRequest.cc b/src/test/librbd/object_map/test_mock_UnlockRequest.cc index 4cd2db46cc92..7f834ca8dba1 100644 --- a/src/test/librbd/object_map/test_mock_UnlockRequest.cc +++ b/src/test/librbd/object_map/test_mock_UnlockRequest.cc @@ -18,6 +18,7 @@ namespace object_map { using ::testing::_; using ::testing::InSequence; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapUnlockRequest : public TestMockFixture { public: @@ -26,7 +27,7 @@ public: void expect_unlock(MockImageCtx &mock_image_ctx, int r) { std::string oid(ObjectMap::object_map_name(mock_image_ctx.id, CEPH_NOSNAP)); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(oid, _, "lock", "unlock", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("unlock"), _, _, _)) .WillOnce(Return(r)); } }; diff --git a/src/test/librbd/object_map/test_mock_UpdateRequest.cc b/src/test/librbd/object_map/test_mock_UpdateRequest.cc index 0d7dffad5b7f..45879f2f83e6 100644 --- a/src/test/librbd/object_map/test_mock_UpdateRequest.cc +++ b/src/test/librbd/object_map/test_mock_UpdateRequest.cc @@ -18,6 +18,7 @@ namespace object_map { using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; class TestMockObjectMapUpdateRequest : public TestMockFixture { public: @@ -25,27 +26,27 @@ public: std::string oid(ObjectMap::object_map_name(ictx->id, snap_id)); if (snap_id == CEPH_NOSNAP) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "lock", "assert_locked", _, _, _)) + exec(oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .WillOnce(DoDefault()); } if (r < 0) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_update", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_update"), _, _, _)) .WillOnce(Return(r)); } else { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(oid, _, "rbd", "object_map_update", _, _, _)) + exec(oid, _, StrEq("rbd"), StrEq("object_map_update"), _, _, _)) .WillOnce(DoDefault()); } } void expect_invalidate(librbd::ImageCtx *ictx) { EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "lock", "assert_locked", _, _, _)) + exec(ictx->header_oid, _, StrEq("lock"), StrEq("assert_locked"), _, _, _)) .Times(0); EXPECT_CALL(get_mock_io_ctx(ictx->md_ctx), - exec(ictx->header_oid, _, "rbd", "set_flags", _, _, _)) + exec(ictx->header_oid, _, StrEq("rbd"), StrEq("set_flags"), _, _, _)) .WillOnce(DoDefault()); } }; diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc index dfe07bf25736..34b0debde8b2 100644 --- a/src/test/librbd/operation/test_mock_ResizeRequest.cc +++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc @@ -53,6 +53,7 @@ using ::testing::_; using ::testing::DoAll; using ::testing::InSequence; using ::testing::Return; +using ::testing::StrEq; using ::testing::WithArg; class TestMockOperationResizeRequest : public TestMockFixture { @@ -104,7 +105,7 @@ public: EXPECT_CALL(*mock_image_ctx.exclusive_lock, assert_header_locked(_)); } EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", "set_size", _, _, _)) + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), StrEq("set_size"), _, _, _)) .WillOnce(Return(r)); } } diff --git a/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc index 96fe0cdadff5..8cc5fda42cfa 100644 --- a/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc @@ -23,6 +23,7 @@ using ::testing::DoAll; using ::testing::DoDefault; using ::testing::Return; using ::testing::SetArgPointee; +using ::testing::StrEq; using ::testing::WithArg; class TestMockOperationSnapshotCreateRequest : public TestMockFixture { @@ -69,9 +70,9 @@ public: } auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", - mock_image_ctx.old_format ? "snap_add" : - "snapshot_add", + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), + StrEq(mock_image_ctx.old_format ? "snap_add" : + "snapshot_add"), _, _, _)); if (r == -ESTALE) { expect.WillOnce(Return(r)).WillOnce(DoDefault()); diff --git a/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc b/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc index ab7a8e485eea..22c02939d059 100644 --- a/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotProtectRequest.cc @@ -23,6 +23,7 @@ using ::testing::DoAll; using ::testing::DoDefault; using ::testing::Return; using ::testing::SetArgPointee; +using ::testing::StrEq; using ::testing::WithArg; class TestMockOperationSnapshotProtectRequest : public TestMockFixture { @@ -46,8 +47,8 @@ public: void expect_set_protection_status(MockImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", - "set_protection_status", _, _, _)); + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), + StrEq("set_protection_status"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); } else { diff --git a/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc index fc1fe2a9cdb9..4dcf3c8b44f3 100644 --- a/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc @@ -23,6 +23,7 @@ using ::testing::DoAll; using ::testing::DoDefault; using ::testing::Return; using ::testing::SetArgPointee; +using ::testing::StrEq; using ::testing::WithArg; class TestMockOperationSnapshotRemoveRequest : public TestMockFixture { @@ -71,7 +72,7 @@ public: void expect_remove_child(MockImageCtx &mock_image_ctx, int r) { bool deep_flatten = mock_image_ctx.image_ctx->test_features(RBD_FEATURE_DEEP_FLATTEN); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(RBD_CHILDREN, _, "rbd", "remove_child",_, + exec(RBD_CHILDREN, _, StrEq("rbd"), StrEq("remove_child"), _, _, _)); if (deep_flatten) { expect.Times(0); @@ -93,9 +94,9 @@ public: void expect_snap_remove(MockImageCtx &mock_image_ctx, int r) { auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", - mock_image_ctx.old_format ? "snap_remove" : - "snapshot_remove", + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), + StrEq(mock_image_ctx.old_format ? "snap_remove" : + "snapshot_remove"), _, _, _)); if (r < 0) { expect.WillOnce(Return(r)); diff --git a/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc b/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc index 4d437d0eae25..b3120274a1c9 100644 --- a/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc @@ -26,6 +26,7 @@ using ::testing::DoDefault; using ::testing::Return; using ::testing::SetArgReferee; using ::testing::SetArgPointee; +using ::testing::StrEq; using ::testing::WithArg; class TestMockOperationSnapshotUnprotectRequest : public TestMockFixture { @@ -54,8 +55,8 @@ public: ::encode(status, bl); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(mock_image_ctx.header_oid, _, "rbd", - "set_protection_status", ContentsEqual(bl), + exec(mock_image_ctx.header_oid, _, StrEq("rbd"), + StrEq("set_protection_status"), ContentsEqual(bl), _, _)); if (r < 0) { expect.WillOnce(Return(r)); @@ -89,7 +90,7 @@ public: ::encode(children, bl); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), - exec(RBD_CHILDREN, _, "rbd", "get_children", _, + exec(RBD_CHILDREN, _, StrEq("rbd"), StrEq("get_children"), _, _, _)); if (r < 0) { expect.WillRepeatedly(Return(r)); diff --git a/src/test/librbd/test_mock_fixture.cc b/src/test/librbd/test_mock_fixture.cc index 363e7166d552..cbd621b4c0de 100644 --- a/src/test/librbd/test_mock_fixture.cc +++ b/src/test/librbd/test_mock_fixture.cc @@ -20,6 +20,7 @@ template class librbd::operation::Request; using ::testing::_; using ::testing::DoDefault; using ::testing::Return; +using ::testing::StrEq; using ::testing::WithArg; TestMockFixture::TestRadosClientPtr TestMockFixture::s_test_rados_client; @@ -57,7 +58,7 @@ void TestMockFixture::TearDown() { void TestMockFixture::expect_unlock_exclusive_lock(librbd::ImageCtx &ictx) { EXPECT_CALL(get_mock_io_ctx(ictx.md_ctx), - exec(_, _, "lock", "unlock", _, _, _)) + exec(_, _, StrEq("lock"), StrEq("unlock"), _, _, _)) .WillRepeatedly(DoDefault()); } -- 2.47.3