From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 5 Dec 2016 16:07:04 +0000 (-0600)
Subject: tests: ensure tests marked with 'all' run on every node
X-Git-Tag: v2.1.0~26^2~28
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4810b38eceffde0b8e1240983a71dd5b0451a608;p=ceph-ansible.git

tests: ensure tests marked with 'all' run on every node

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/tests/conftest.py b/tests/conftest.py
index 3f31ee8d9..c9aacba06 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,7 +5,7 @@ import pytest
 def CephNode(Ansible, Interface, request):
     vars = Ansible.get_variables()
     node_type = vars["group_names"][0]
-    if not request.node.get_marker(node_type):
+    if not request.node.get_marker(node_type) and not request.node.get_marker('all'):
         pytest.skip("Not a valid test for node type")
 
     # I can assume eth1 because I know all the vagrant