]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/test_rbd: fix test_create_defaults 7155/head
authorJosh Durgin <jdurgin@redhat.com>
Fri, 8 Jan 2016 03:50:23 +0000 (19:50 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 8 Jan 2016 03:52:38 +0000 (19:52 -0800)
Adjust for default order only being applied via ceph conf since
16d50459c4996cd3b188bc5da100d1ce069f05cd

Fixes: #14279
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
src/test/pybind/test_rbd.py

index 056cbbf60cd836c71fa4e09af86ce98d89f2b90c..093a40dc8bc409bd2621d0e20208c201201bf88f 100644 (file)
@@ -137,7 +137,7 @@ def check_default_params(format, order=None, features=None, stripe_count=None,
                 with Image(ioctx, image_name) as image:
                     eq(format == 1, image.old_format())
 
-                    expected_order = order
+                    expected_order = int(rados.conf_get('rbd_default_order'))
                     actual_order = image.stat()['order']
                     eq(expected_order, actual_order)
 
@@ -170,6 +170,8 @@ def test_create_defaults():
     check_default_params(1)
     check_default_params(2)
     # invalid order
+    check_default_params(1, 0, exception=ArgumentOutOfRange)
+    check_default_params(2, 0, exception=ArgumentOutOfRange)
     check_default_params(1, 11, exception=ArgumentOutOfRange)
     check_default_params(2, 11, exception=ArgumentOutOfRange)
     check_default_params(1, 65, exception=ArgumentOutOfRange)