]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: ensure tests marked with 'all' run on every node
authorAndrew Schoen <aschoen@redhat.com>
Mon, 5 Dec 2016 16:07:04 +0000 (10:07 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 6 Dec 2016 20:56:19 +0000 (14:56 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
tests/conftest.py

index 3f31ee8d9d788dccc82a0457d4e57af2311e0e1f..c9aacba062f5d6ba9ba306b45670f9a8b604a6cb 100644 (file)
@@ -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