From: Venky Shankar Date: Fri, 18 Nov 2016 06:15:30 +0000 (+0530) Subject: tests / rbd: fix rbd python binding test X-Git-Tag: v11.1.0~219^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f6ef037cefbb3146cdc602aaf13d1df9ce24a03;p=ceph.git tests / rbd: fix rbd python binding test Signed-off-by: Venky Shankar --- diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index f637c8a0aba7..e4887ebbdc77 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -133,6 +133,10 @@ def check_default_params(format, order=None, features=None, stripe_count=None, rados.conf_set('rbd_default_stripe_count', str(stripe_count or 0)) if stripe_unit is not None: rados.conf_set('rbd_default_stripe_unit', str(stripe_unit or 0)) + feature_data_pool = 0 + datapool = rados.conf_get('rbd_default_data_pool') + if not len(datapool) == 0: + feature_data_pool = 128 image_name = get_temp_image_name() if exception is None: RBD().create(ioctx, image_name, IMG_SIZE) @@ -145,8 +149,12 @@ def check_default_params(format, order=None, features=None, stripe_count=None, eq(expected_order, actual_order) expected_features = features - if expected_features is None or format == 1: - expected_features = 0 if format == 1 else 61 + if format == 1: + expected_features = 0 + elif expected_features is None: + expected_features = 61 | feature_data_pool + else: + expected_features |= feature_data_pool eq(expected_features, image.features()) expected_stripe_count = stripe_count