From: Mykola Golub Date: Tue, 16 Jun 2020 13:43:23 +0000 (+0100) Subject: test/librbd: make TestLibRBD.QuiesceWatchError pass X-Git-Tag: v16.1.0~2015^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35329%2Fhead;p=ceph.git test/librbd: make TestLibRBD.QuiesceWatchError pass when a duplicate quiesce notification is received Signed-off-by: Mykola Golub --- diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index cbd9f12927bb..f046efe91bd7 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -8362,16 +8362,17 @@ TEST_F(TestLibRBD, QuiesceWatchError) ASSERT_EQ(0, image2.quiesce_watch(&watcher2, &handle2)); ASSERT_EQ(-EINVAL, image1.snap_create("snap1")); - ASSERT_EQ(1U, watcher1.quiesce_count); + ASSERT_LT(0U, watcher1.quiesce_count); ASSERT_EQ(0U, watcher1.unquiesce_count); ASSERT_EQ(1U, watcher2.quiesce_count); ASSERT_EQ(1U, watcher2.unquiesce_count); PrintProgress prog_ctx; + watcher1.quiesce_count = 0; ASSERT_EQ(0, image2.snap_create2("snap2", RBD_SNAP_CREATE_IGNORE_QUIESCE_ERROR, prog_ctx)); - ASSERT_EQ(2U, watcher1.quiesce_count); + ASSERT_LT(0U, watcher1.quiesce_count); ASSERT_EQ(0U, watcher1.unquiesce_count); ASSERT_EQ(2U, watcher2.quiesce_count); ASSERT_EQ(2U, watcher2.unquiesce_count);