ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: add a journal_collocation tag to collocated journal tests 

The test will be skipped if journal_collocation is not True in the
group_vars for the scenario.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/1150/head
Andrew Schoen 2016-12-05 16:21:52 -06:00
parent dddfe6d9de
commit 1b3aca44d7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/conftest.py
View File

@ -8,6 +8,9 @@ def CephNode(Ansible, Interface, Command, request):
if not request.node.get_marker(node_type) and not request.node.get_marker('all'): if not request.node.get_marker(node_type) and not request.node.get_marker('all'):
pytest.skip("Not a valid test for node type") pytest.skip("Not a valid test for node type")
if request.node.get_marker("journal_collocation") and not vars.get("journal_collocation"):
pytest.skip("Skipping because scenario is not using journal collocation")
osd_ids = [] osd_ids = []
if node_type == "osds": if node_type == "osds":
result = Command.check_output('sudo ls /var/lib/ceph/osd/ | grep -oP "\d+$"') result = Command.check_output('sudo ls /var/lib/ceph/osd/ | grep -oP "\d+$"')
@ -39,3 +42,6 @@ def pytest_collection_modifyitems(session, config, items):
item.add_marker(pytest.mark.rgws) item.add_marker(pytest.mark.rgws)
else: else:
item.add_marker(pytest.mark.all) item.add_marker(pytest.mark.all)
if "journal_collocation" in test_path:
item.add_marker(pytest.mark.journal_collocation)