From 30c4f6a13e7c7edb3f27720c6b524e851c1aabb3 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 1 May 2017 10:45:03 -0500 Subject: [PATCH] tests: adds a way to mark docker only tests Signed-off-by: Andrew Schoen (cherry picked from commit 06b36fddf9689659b97c480b8b6644775fac907b) --- tests/conftest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 4899fbcd6..9b4725ac2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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")