test/librbd/test_notify.py: drop RBD_DISABLE_UPDATE_FEATURES

This was put in place in commit 9c0b239d70cd ("qa/upgrade:
conditionally disable update_features tests") to paper over a backwards
compatibility issue that arose from commit 01ff1530544c ("librbd: make
all maintenance op notifications async").  It's not needed in squid or
later because upgrades from octopus are tested only until reef.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit bfc0b4f3015ec79c00a0ab684a4b7d58cb667e86)

diff --git a/src/test/librbd/test_notify.py b/src/test/librbd/test_notify.py
index bef988808aef0681a2b858c490ab5c4c2cd2c255..d0320dc282bf9458a7de60f346f91c24c539e51d 100755 (executable)
--- a/src/test/librbd/test_notify.py
+++ b/src/test/librbd/test_notify.py
@@ -143,18 +143,15 @@ def slave(ioctx):
         assert(not image.is_exclusive_lock_owner())
         assert(list(image.list_snaps()) == [])
 
-        if 'RBD_DISABLE_UPDATE_FEATURES' not in os.environ:
-            print("update_features")
-            assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
-            image.update_features(RBD_FEATURE_OBJECT_MAP, False)
-            assert(not image.is_exclusive_lock_owner())
-            assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0)
-            image.update_features(RBD_FEATURE_OBJECT_MAP, True)
-            assert(not image.is_exclusive_lock_owner())
-            assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
-            assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0)
-        else:
-            print("skipping update_features")
+        print("update_features")
+        assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
+        image.update_features(RBD_FEATURE_OBJECT_MAP, False)
+        assert(not image.is_exclusive_lock_owner())
+        assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0)
+        image.update_features(RBD_FEATURE_OBJECT_MAP, True)
+        assert(not image.is_exclusive_lock_owner())
+        assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
+        assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0)
 
         print("rebuild object map")
         image.rebuild_object_map()