]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: skip rgw_tuning_pools_are_set when rgw_create_pools is not defined
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 22 Jun 2018 09:20:33 +0000 (11:20 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 11 Jul 2018 12:45:05 +0000 (14:45 +0200)
since ooo_collocation scenario is supposed to be the same scenario than the
one tested by OSP and they are not passing `rgw_create_pools` the test
`test_docker_rgw_tuning_pools_are_set` will fail:
```
>       pools = node["vars"]["rgw_create_pools"]
E       KeyError: 'rgw_create_pools'
```

skipping this test if `node["vars"]["rgw_create_pools"]` is not defined
fixes this failure.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 1c3dae4a90816ac6503967779b7fd77ff84900b5)

tests/functional/tests/rgw/test_rgw_tuning.py

index 7ef561e913cefd1cd0a147a6dde50307b84e75ab..8e905fc618aaa1e4105a6cec45eaca8f72d7831d 100644 (file)
@@ -36,7 +36,9 @@ class TestRGWs(object):
             cluster=cluster
         )
         output = host.check_output(cmd)
-        pools = node["vars"]["rgw_create_pools"]
+        pools = node["vars"].get("rgw_create_pools")
+        if pools == None:
+            pytest.skip('rgw_create_pools not defined, nothing to test')
         for pool_name, pg_num in pools.items():
             assert pool_name in output
             pg_num_str = "pg_num {pg_num}".format(pg_num=pg_num["pg_num"])