From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 29 May 2023 15:40:05 +0000 (+0200)
Subject: Revert "test: adjust rbd test case guards to handle new defaults"
X-Git-Tag: v19.0.0~1109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51818%2Fhead;p=ceph.git

Revert "test: adjust rbd test case guards to handle new defaults"

This reverts commit feb2fc02404775bc262677a2d0434faec0348c53 which
appears to have caused us to lose old format coverage in the Python
bindings tests (rbd_python_api_tests_old_format.yaml).

Unset RBD_FEATURES enviroment variable means "old format".  This
shouldn't be mucked with in any way, see require_new_format() and
create_image() methods in particular.

Fixes: https://tracker.ceph.com/issues/61495
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index e42f7f00f091..05cb6c305096 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -75,7 +75,8 @@ def setup_module():
     RBD().pool_init(ioctx, True)
     global features
     features = os.getenv("RBD_FEATURES")
-    features = int(features) if features is not None else 61
+    if features is not None:
+        features = int(features)
 
 def teardown_module():
     global ioctx