From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 20 Jan 2016 18:59:49 +0000 (-0500)
Subject: test: correct v1 image format mock expectations
X-Git-Tag: v10.0.4~151^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a4218389441ce9d663ed6e5467fd5e19a3fe931;p=ceph.git

test: correct v1 image format mock expectations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc
index d4019431eb30..96fe0cdadff5 100644
--- a/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc
+++ b/src/test/librbd/operation/test_mock_SnapshotCreateRequest.cc
@@ -105,6 +105,8 @@ public:
 };
 
 TEST_F(TestMockOperationSnapshotCreateRequest, Success) {
+  REQUIRE_FORMAT_V2();
+
   librbd::ImageCtx *ictx;
   ASSERT_EQ(0, open_image(m_image_name, &ictx));
 
@@ -127,8 +129,10 @@ TEST_F(TestMockOperationSnapshotCreateRequest, Success) {
   expect_block_writes(mock_image_ctx);
   expect_allocate_snap_id(mock_image_ctx, 0);
   expect_snap_create(mock_image_ctx, 0);
-  expect_update_snap_context(mock_image_ctx);
-  expect_object_map_snap_create(mock_image_ctx);
+  if (!mock_image_ctx.old_format) {
+    expect_update_snap_context(mock_image_ctx);
+    expect_object_map_snap_create(mock_image_ctx);
+  }
   expect_unblock_writes(mock_image_ctx);
 
   C_SaferCond cond_ctx;
@@ -192,8 +196,10 @@ TEST_F(TestMockOperationSnapshotCreateRequest, CreateSnapStale) {
   expect_block_writes(mock_image_ctx);
   expect_allocate_snap_id(mock_image_ctx, -ESTALE);
   expect_snap_create(mock_image_ctx, -ESTALE);
-  expect_update_snap_context(mock_image_ctx);
-  expect_object_map_snap_create(mock_image_ctx);
+  if (!mock_image_ctx.old_format) {
+    expect_update_snap_context(mock_image_ctx);
+    expect_object_map_snap_create(mock_image_ctx);
+  }
   expect_unblock_writes(mock_image_ctx);
 
   C_SaferCond cond_ctx;