From 31a960c3230ea08937c4ad78aa23a4cdf5382db4 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 21 Aug 2017 15:42:24 -0400 Subject: [PATCH] tests/mons: update tests to use new host fixture Signed-off-by: Alfredo Deza --- tests/functional/tests/mon/test_mons.py | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/functional/tests/mon/test_mons.py b/tests/functional/tests/mon/test_mons.py index d97429aff..c13c8c5dd 100644 --- a/tests/functional/tests/mon/test_mons.py +++ b/tests/functional/tests/mon/test_mons.py @@ -4,46 +4,46 @@ import pytest class TestMons(object): @pytest.mark.no_docker - def test_ceph_mon_package_is_installed(self, node, Package): - assert Package("ceph-mon").is_installed + def test_ceph_mon_package_is_installed(self, node, host): + assert host.package("ceph-mon").is_installed - def test_mon_listens_on_6789(self, node, Socket): - assert Socket("tcp://%s:6789" % node["address"]).is_listening + def test_mon_listens_on_6789(self, node, host): + assert host.socket("tcp://%s:6789" % node["address"]).is_listening - def test_mon_service_is_running(self, node, Service): + def test_mon_service_is_running(self, node, host): service_name = "ceph-mon@ceph-{hostname}".format( hostname=node["vars"]["inventory_hostname"] ) - assert Service(service_name).is_running + assert host.service(service_name).is_running - def test_mon_service_is_enabled(self, node, Service): + def test_mon_service_is_enabled(self, node, host): service_name = "ceph-mon@ceph-{hostname}".format( hostname=node["vars"]["inventory_hostname"] ) - assert Service(service_name).is_enabled + assert host.service(service_name).is_enabled @pytest.mark.no_docker - def test_can_get_cluster_health(self, node, Command): + def test_can_get_cluster_health(self, node, host): cmd = "sudo ceph --cluster={} --connect-timeout 5 -s".format(node["cluster_name"]) - output = Command.check_output(cmd) + output = host.check_output(cmd) assert output.strip().startswith("cluster") class TestOSDs(object): @pytest.mark.no_docker - def test_all_osds_are_up_and_in(self, node, Command): + def test_all_osds_are_up_and_in(self, node, host): cmd = "sudo ceph --cluster={} --connect-timeout 5 -s".format(node["cluster_name"]) - output = Command.check_output(cmd) + output = host.check_output(cmd) phrase = "{num_osds} osds: {num_osds} up, {num_osds} in".format(num_osds=node["total_osds"]) assert phrase in output @pytest.mark.docker - def test_all_docker_osds_are_up_and_in(self, node, Command): + def test_all_docker_osds_are_up_and_in(self, node, host): cmd = "sudo docker exec ceph-mon-ceph-{} ceph --cluster={} --connect-timeout 5 -s".format( node["vars"]["inventory_hostname"], node["cluster_name"] ) - output = Command.check_output(cmd) + output = host.check_output(cmd) phrase = "{num_osds} osds: {num_osds} up, {num_osds} in".format(num_osds=node["total_osds"]) assert phrase in output