From 1a2e65bdfd22652809adc4a4bacee79447400b66 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 10 May 2018 16:30:11 -0600 Subject: [PATCH] ceph-docker: Update tests for 'containerized' flag Signed-off-by: Zack Cerza --- ansible/roles/ceph-docker/tests/test_docker.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/roles/ceph-docker/tests/test_docker.py b/ansible/roles/ceph-docker/tests/test_docker.py index 2508858..d04ae7b 100644 --- a/ansible/roles/ceph-docker/tests/test_docker.py +++ b/ansible/roles/ceph-docker/tests/test_docker.py @@ -5,12 +5,8 @@ testinfra_hosts = ['ceph-grafana'] class TestDocker(object): def maybe_skip(self, host): - services = ['grafana', 'prometheus'] - - def is_containerized(service): - vars = host.ansible.get_variables() - return vars.get(service, dict()).get('containerized') - if not any(map(is_containerized, services)): + vars = host.ansible.get_variables() + if vars.get('containerized', False) is False: pytest.skip() def test_docker_running(self, host): -- 2.47.3