From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 8 Jan 2016 03:50:23 +0000 (-0800)
Subject: pybind/test_rbd: fix test_create_defaults
X-Git-Tag: v10.0.3~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9749240ecd13efb9c8c1ebc6a9ea11fb6bfd72bb;p=ceph.git

pybind/test_rbd: fix test_create_defaults

Adjust for default order only being applied via ceph conf since
16d50459c4996cd3b188bc5da100d1ce069f05cd

Fixes: #14279
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index 056cbbf60cd8..093a40dc8bc4 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -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)