From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 19 Apr 2017 13:26:31 +0000 (-0400)
Subject: test: rbd master/slave notify test should test active features
X-Git-Tag: v11.2.1~146^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d5398effcfacb6d5436ae32e1ee40872efd5b504;p=ceph.git

test: rbd master/slave notify test should test active features

Fixes: http://tracker.ceph.com/issues/19692
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0dcba41cba96566d0b8da54cf0316d523b88ded2)
---

diff --git a/src/test/librbd/test_notify.py b/src/test/librbd/test_notify.py
index ecd8bd48e5ac5..6571935f961fa 100755
--- a/src/test/librbd/test_notify.py
+++ b/src/test/librbd/test_notify.py
@@ -141,8 +141,10 @@ def slave(ioctx):
         assert(list(image.list_snaps()) == [])
 
         print("rebuild object map")
-        image.update_features(RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_FAST_DIFF,
-                              False)
+        features = image.features() & (
+                RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_FAST_DIFF)
+        if features:
+            image.update_features(features, False)
         image.update_features(RBD_FEATURE_OBJECT_MAP, True)
         assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0)
         image.rebuild_object_map()