tests/install: update tests to use new host fixture

Signed-off-by: Alfredo Deza <adeza@redhat.com>
pull/1781/head
Alfredo Deza 2017-08-21 15:41:58 -04:00
parent c0ad0b58f0
commit ecf917d354
1 changed files with 18 additions and 18 deletions

View File

@ -3,40 +3,40 @@ import pytest
class TestInstall(object): class TestInstall(object):
def test_ceph_dir_exists(self, File, node): def test_ceph_dir_exists(self, host, node):
assert File('/etc/ceph').exists assert host.file('/etc/ceph').exists
def test_ceph_dir_is_a_directory(self, File, node): def test_ceph_dir_is_a_directory(self, host, node):
assert File('/etc/ceph').is_directory assert host.file('/etc/ceph').is_directory
def test_ceph_conf_exists(self, File, node): def test_ceph_conf_exists(self, host, node):
assert File(node["conf_path"]).exists assert host.file(node["conf_path"]).exists
def test_ceph_conf_is_a_file(self, File, node): def test_ceph_conf_is_a_file(self, host, node):
assert File(node["conf_path"]).is_file assert host.file(node["conf_path"]).is_file
@pytest.mark.no_docker @pytest.mark.no_docker
def test_ceph_command_exists(self, Command, node): def test_ceph_command_exists(self, host, node):
assert Command.exists("ceph") assert host.exists("ceph")
class TestCephConf(object): class TestCephConf(object):
def test_ceph_config_has_inital_members_line(self, node, File): def test_ceph_config_has_inital_members_line(self, node, host):
assert File(node["conf_path"]).contains("^mon initial members = .*$") assert host.file(node["conf_path"]).contains("^mon initial members = .*$")
def test_initial_members_line_has_correct_value(self, node, File): def test_initial_members_line_has_correct_value(self, node, host):
mons = ",".join("ceph-%s" % host mons = ",".join("ceph-%s" % host
for host in node["vars"]["groups"]["mons"]) for host in node["vars"]["groups"]["mons"])
line = "mon initial members = {}".format(mons) line = "mon initial members = {}".format(mons)
assert File(node["conf_path"]).contains(line) assert host.file(node["conf_path"]).contains(line)
def test_ceph_config_has_mon_host_line(self, node, File): def test_ceph_config_has_mon_host_line(self, node, host):
assert File(node["conf_path"]).contains("^mon host = .*$") assert host.file(node["conf_path"]).contains("^mon host = .*$")
def test_mon_host_line_has_correct_value(self, node, File): def test_mon_host_line_has_correct_value(self, node, host):
mon_ips = [] mon_ips = []
for x in range(0, node["num_mons"]): for x in range(0, node["num_mons"]):
mon_ips.append("{}.1{}".format(node["subnet"], x)) mon_ips.append("{}.1{}".format(node["subnet"], x))
line = "mon host = {}".format(",".join(mon_ips)) line = "mon host = {}".format(",".join(mon_ips))
assert File(node["conf_path"]).contains(line) assert host.file(node["conf_path"]).contains(line)