From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 12 Aug 2016 18:16:11 +0000 (-0400)
Subject: test: librbd features test case should only disable active features
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ee705fb7e3b2eeb15357d328acfe61709ed7bb7;p=ceph.git

test: librbd features test case should only disable active features

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

diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index fa470eeda5d3..5f77b03e58ed 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -3021,12 +3021,17 @@ TEST_F(TestLibRBD, UpdateFeatures)
     return;
   }
 
+  uint64_t features;
+  ASSERT_EQ(0, image.features(&features));
+
   // must provide a single feature
   ASSERT_EQ(-EINVAL, image.update_features(0, true));
 
-  ASSERT_EQ(0, image.update_features(RBD_FEATURE_EXCLUSIVE_LOCK |
-                                       RBD_FEATURE_OBJECT_MAP |
-                                       RBD_FEATURE_FAST_DIFF, false));
+  uint64_t disable_features;
+  disable_features = features & RBD_FEATURES_MUTABLE;
+  if (disable_features != 0) {
+    ASSERT_EQ(0, image.update_features(disable_features, false));
+  }
 
   // cannot enable object map w/o exclusive lock
   ASSERT_EQ(-EINVAL, image.update_features(RBD_FEATURE_OBJECT_MAP, true));