]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests conftest conditions the no_lvm_scenario marker
authorAlfredo Deza <adeza@redhat.com>
Thu, 31 Aug 2017 12:48:24 +0000 (08:48 -0400)
committerAlfredo Deza <adeza@redhat.com>
Thu, 31 Aug 2017 12:48:24 +0000 (08:48 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
tests/conftest.py

index 5a5b7a478402304ae38113d361bdcc903daadb8e..c5fc80c0394fb898a140442888bc29ba56f568a8 100644 (file)
@@ -23,6 +23,9 @@ def node(host, 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("no_lvm_scenario") and lvm_scenario:
+        pytest.skip("Not a valid test for lvm scenarios")
+
     if not lvm_scenario and request.node.get_marker("lvm_scenario"):
         pytest.skip("Not a valid test for non-lvm scenarios")