From: Andrew Schoen Date: Tue, 6 Dec 2016 20:13:50 +0000 (-0600) Subject: tests: dmcrypt_journal_collocation should run journal collocation tests X-Git-Tag: v2.1.0~26^2~11 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4323607c2e9b9916b146d89221a4f1594fe9427d;p=ceph-ansible.git tests: dmcrypt_journal_collocation should run journal collocation tests Signed-off-by: Andrew Schoen --- diff --git a/tests/conftest.py b/tests/conftest.py index a90b14fcf..87f1ac333 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,7 +16,8 @@ def node(Ansible, Interface, Command, request): if not request.node.get_marker(node_type) and not request.node.get_marker('all'): pytest.skip("Not a valid test for node type: %s" % node_type) - if request.node.get_marker("journal_collocation") and not ansible_vars.get("journal_collocation"): + journal_collocation_test = ansible_vars.get("journal_collocation") or ansible_vars.get("dmcrypt_journal_collocation") + if request.node.get_marker("journal_collocation") and not journal_collocation_test: pytest.skip("Scenario is not using journal collocation") osd_ids = []