ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: improve mds tests 

the expected number of mds daemon consist of number of daemons that are
'up' + number of daemons 'up:standby'.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/2733/head
Guillaume Abrioux 2018-06-06 21:56:38 +02:00 committed by Sébastien Han
parent 433ecc7cbc
commit c94ada69e8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/functional/tests/mds/test_mds.py
View File

@ -23,9 +23,9 @@ class TestMDSs(object):
def test_mds_is_up(self, node, host):
hostname = node["vars"]["inventory_hostname"]
cmd = "sudo ceph --name client.bootstrap-mds --keyring /var/lib/ceph/bootstrap-mds/{cluster}.keyring --cluster={cluster} --connect-timeout 5 -f json -s".format(cluster=node['cluster_name'])
output = host.check_output(cmd)
daemons = json.loads(output)["fsmap"]["by_rank"][0]["name"]
assert hostname in daemons
cluster_status = json.loads(host.check_output(cmd))
assert (cluster_status['fsmap'].get('up', 0) + cluster_status['fsmap'].get('up:standby', 0)) == len(node["vars"]["groups"]["mdss"])
@pytest.mark.docker
def test_docker_mds_is_up(self, node, host):
@ -34,7 +34,6 @@ class TestMDSs(object):
hostname=node["vars"]["inventory_hostname"],
cluster=node["cluster_name"]
)
num_mdss = len(host.ansible.get_variables()["groups"]["mdss"])
output_raw = host.check_output(cmd)
output_json = json.loads(output_raw)
assert output_json['fsmap']['up'] and output_json['fsmap']['in'] == num_mdss
cluster_status = json.loads(host.check_output(cmd))
assert (cluster_status['fsmap'].get('up', 0) + cluster_status['fsmap'].get('up:standby', 0)) == len(node["vars"]["groups"]["mdss"])