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

test_osds: remove scenario leftover 

Since there's only only scenario available we don't need lvm_scenario
and no_lvm_scenario.
Also add missing assert for ceph-volume tests.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit f601549a8a)
pull/3884/head
Dimitri Savineau 2019-04-16 16:23:51 -04:00 committed by Guillaume Abrioux
parent 8edb064606
commit 85489315fa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/functional/tests/osd/test_osds.py
View File

@ -26,7 +26,6 @@ class TestOSDs(object):
for osd in setup["osds"]: for osd in setup["osds"]:
assert host.service("ceph-osd@%s" % osd).is_running assert host.service("ceph-osd@%s" % osd).is_running
@pytest.mark.no_lvm_scenario
def test_osd_services_are_enabled(self, node, host, setup): def test_osd_services_are_enabled(self, node, host, setup):
# TODO: figure out way to paramaterize node['osds'] for this test # TODO: figure out way to paramaterize node['osds'] for this test
for osd in setup["osds"]: for osd in setup["osds"]:
@ -42,13 +41,13 @@ class TestOSDs(object):
) )
assert host.mount_point(osd_path).exists assert host.mount_point(osd_path).exists
@pytest.mark.lvm_scenario @pytest.mark.no_docker
def test_ceph_volume_is_installed(self, node, host): def test_ceph_volume_is_installed(self, node, host):
host.exists('ceph-volume') assert host.exists('ceph-volume')
@pytest.mark.lvm_scenario @pytest.mark.no_docker
def test_ceph_volume_systemd_is_installed(self, node, host): def test_ceph_volume_systemd_is_installed(self, node, host):
host.exists('ceph-volume-systemd') assert host.exists('ceph-volume-systemd')
def _get_osd_id_from_host(self, node, osd_tree): def _get_osd_id_from_host(self, node, osd_tree):
children = [] children = []