From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 17 Aug 2017 22:39:05 +0000 (-0400)
Subject: test/librbd: TestMirroringWatcher unit tests should ignore duplicates
X-Git-Tag: v13.0.0~60^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17078%2Fhead;p=ceph.git

test/librbd: TestMirroringWatcher unit tests should ignore duplicates

Fixes: http://tracker.ceph.com/issues/21029
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/librbd/test_MirroringWatcher.cc b/src/test/librbd/test_MirroringWatcher.cc
index f29ff933fdac1..7b49b71a8d8bd 100644
--- a/src/test/librbd/test_MirroringWatcher.cc
+++ b/src/test/librbd/test_MirroringWatcher.cc
@@ -32,6 +32,7 @@ struct MockMirroringWatcher : public MirroringWatcher<> {
 } // anonymous namespace
 
 using ::testing::_;
+using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::StrEq;
 using ::testing::WithArg;
@@ -72,10 +73,13 @@ public:
 };
 
 TEST_F(TestMirroringWatcher, ModeUpdated) {
-  EXPECT_CALL(*m_image_watcher, handle_mode_updated(cls::rbd::MIRROR_MODE_DISABLED));
+  EXPECT_CALL(*m_image_watcher,
+              handle_mode_updated(cls::rbd::MIRROR_MODE_DISABLED))
+    .Times(AtLeast(1));
 
   C_SaferCond ctx;
-  MockMirroringWatcher::notify_mode_updated(m_ioctx, cls::rbd::MIRROR_MODE_DISABLED, &ctx);
+  MockMirroringWatcher::notify_mode_updated(
+    m_ioctx, cls::rbd::MIRROR_MODE_DISABLED, &ctx);
   ASSERT_EQ(0, ctx.wait());
 }
 
@@ -83,12 +87,13 @@ TEST_F(TestMirroringWatcher, ImageStatusUpdated) {
   EXPECT_CALL(*m_image_watcher,
               handle_image_updated(cls::rbd::MIRROR_IMAGE_STATE_ENABLED,
                                    StrEq("image id"),
-                                   StrEq("global image id")));
+                                   StrEq("global image id")))
+    .Times(AtLeast(1));
 
   C_SaferCond ctx;
-  MockMirroringWatcher::notify_image_updated(m_ioctx,
-                                             cls::rbd::MIRROR_IMAGE_STATE_ENABLED,
-                                             "image id", "global image id", &ctx);
+  MockMirroringWatcher::notify_image_updated(
+    m_ioctx, cls::rbd::MIRROR_IMAGE_STATE_ENABLED, "image id",
+    "global image id", &ctx);
   ASSERT_EQ(0, ctx.wait());
 }