diff options
| author | Jason Dillaman <dillaman@redhat.com> | 2020-06-18 18:56:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 18:56:31 +0200 |
| commit | 187367ff17de1e63f4331f41be89a7a642ce4fc4 (patch) | |
| tree | 49c558ef8670165083f4f7863b2576ce011fee1d /src/test/librbd/image | |
| parent | Merge PR #35649 into master (diff) | |
| parent | test/librbd: make TestLibRBD.QuiesceWatchError pass (diff) | |
| download | ceph-187367ff17de1e63f4331f41be89a7a642ce4fc4.tar.xz ceph-187367ff17de1e63f4331f41be89a7a642ce4fc4.zip | |
Merge pull request #35329 from trociny/wip-quiesce_complete
librbd: quiesce/unquiesce API improvements
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/test/librbd/image')
| -rw-r--r-- | src/test/librbd/image/test_mock_AttachChildRequest.cc | 4 | ||||
| -rw-r--r-- | src/test/librbd/image/test_mock_CloneRequest.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/test/librbd/image/test_mock_AttachChildRequest.cc b/src/test/librbd/image/test_mock_AttachChildRequest.cc index 14f9a734073..100d2da2457 100644 --- a/src/test/librbd/image/test_mock_AttachChildRequest.cc +++ b/src/test/librbd/image/test_mock_AttachChildRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Operations.h" #include "librbd/image/AttachChildRequest.h" #include "librbd/image/RefreshRequest.h" +#include "librbd/internal.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -72,8 +73,9 @@ public: TestMockFixture::SetUp(); ASSERT_EQ(0, open_image(m_image_name, &image_ctx)); + NoOpProgressContext prog_ctx; ASSERT_EQ(0, image_ctx->operations->snap_create( - cls::rbd::UserSnapshotNamespace{}, "snap")); + cls::rbd::UserSnapshotNamespace{}, "snap", 0, prog_ctx)); if (is_feature_enabled(RBD_FEATURE_LAYERING)) { ASSERT_EQ(0, image_ctx->operations->snap_protect( cls::rbd::UserSnapshotNamespace{}, "snap")); diff --git a/src/test/librbd/image/test_mock_CloneRequest.cc b/src/test/librbd/image/test_mock_CloneRequest.cc index 1ba69bed6e8..1745a96335c 100644 --- a/src/test/librbd/image/test_mock_CloneRequest.cc +++ b/src/test/librbd/image/test_mock_CloneRequest.cc @@ -237,8 +237,9 @@ public: ASSERT_EQ(0, _rados.conf_set("rbd_default_clone_format", "2")); ASSERT_EQ(0, open_image(m_image_name, &image_ctx)); + NoOpProgressContext prog_ctx; ASSERT_EQ(0, image_ctx->operations->snap_create( - cls::rbd::UserSnapshotNamespace{}, "snap")); + cls::rbd::UserSnapshotNamespace{}, "snap", 0, prog_ctx)); if (is_feature_enabled(RBD_FEATURE_LAYERING)) { ASSERT_EQ(0, image_ctx->operations->snap_protect( cls::rbd::UserSnapshotNamespace{}, "snap")); |