X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Ftest%2Flibrbd%2Foperation%2Ftest_mock_DisableFeaturesRequest.cc;h=dcbfa2ec2aa8d1c14186253828183d84b102a632;hb=224ce89bce8186937e77bdbda572a650953f8c23;hp=7ae6d96a872d383023b6e855443b202b8f33f4df;hpb=06dae762bfef1ba116dc58483c7b68b733d853e0;p=ceph.git

diff --git a/ceph/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc b/ceph/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc
index 7ae6d96a8..dcbfa2ec2 100644
--- a/ceph/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc
+++ b/ceph/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc
@@ -292,9 +292,13 @@ TEST_F(TestMockOperationDisableFeaturesRequest, All) {
 
   MockOperationImageCtx mock_image_ctx(*ictx);
   MockExclusiveLock mock_exclusive_lock;
-  MockJournal mock_journal;
+  MockJournal mock_journal_stack;
+  MockJournal *mock_journal = &mock_journal_stack;
+  if (features_to_disable & RBD_FEATURE_JOURNALING) {
+    mock_journal = new MockJournal();
+  }
   MockObjectMap mock_object_map;
-  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, mock_journal,
+  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, *mock_journal,
 		      mock_object_map);
 
   expect_verify_lock_ownership(mock_image_ctx);
@@ -440,9 +444,9 @@ TEST_F(TestMockOperationDisableFeaturesRequest, Mirroring) {
 
   MockOperationImageCtx mock_image_ctx(*ictx);
   MockExclusiveLock mock_exclusive_lock;
-  MockJournal mock_journal;
+  MockJournal *mock_journal = new MockJournal();
   MockObjectMap mock_object_map;
-  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, mock_journal,
+  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, *mock_journal,
 		      mock_object_map);
 
   expect_verify_lock_ownership(mock_image_ctx);
@@ -483,9 +487,9 @@ TEST_F(TestMockOperationDisableFeaturesRequest, MirroringError) {
 
   MockOperationImageCtx mock_image_ctx(*ictx);
   MockExclusiveLock mock_exclusive_lock;
-  MockJournal mock_journal;
+  MockJournal *mock_journal = new MockJournal();
   MockObjectMap mock_object_map;
-  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, mock_journal,
+  initialize_features(ictx, mock_image_ctx, mock_exclusive_lock, *mock_journal,
 		      mock_object_map);
 
   expect_verify_lock_ownership(mock_image_ctx);