]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: adds a way to mark docker only tests
authorAndrew Schoen <aschoen@redhat.com>
Mon, 1 May 2017 15:45:03 +0000 (10:45 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Mon, 1 May 2017 15:45:03 +0000 (10:45 -0500)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
tests/conftest.py

index 4899fbcd664e74c7f0dfc56d5515fd1ecf098440..9b4725ac251f94375f0d5e5d7b42d971521ecdf5 100644 (file)
@@ -20,6 +20,9 @@ def node(Ansible, Interface, Command, request):
     if request.node.get_marker("no_docker") and docker:
         pytest.skip("Not a valid test for containerized deployments or atomic hosts")
 
+    if request.node.get_marker("docker") and not docker:
+        pytest.skip("Not a valid test for non-containerized deployments or atomic hosts")
+
     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")