]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: librbd features test case should only disable active features 10713/head
authorJason Dillaman <dillaman@redhat.com>
Fri, 12 Aug 2016 18:16:11 +0000 (14:16 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 12 Aug 2016 18:16:11 +0000 (14:16 -0400)
Fixes: http://tracker.ceph.com/issues/16898
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/librbd/test_librbd.cc

index fa470eeda5d39e624740e7472da715a3136ad66f..5f77b03e58edf8a90f70f879057f3e374d3ce0e0 100644 (file)
@@ -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));