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 f601549a8a6a859548b3d8259f23150572e09c67)

diff --git a/tests/functional/tests/osd/test_osds.py b/tests/functional/tests/osd/test_osds.py
index d18167045a76ffedee2572aef7e90602b28b2fac..7605d814c36061dd75b8c759a1337481fa3c2c98 100644 (file)
--- a/tests/functional/tests/osd/test_osds.py
+++ b/tests/functional/tests/osd/test_osds.py
@@ -26,7 +26,6 @@ class TestOSDs(object):
         for osd in setup["osds"]:
             assert host.service("ceph-osd@%s" % osd).is_running
 
-    @pytest.mark.no_lvm_scenario
     def test_osd_services_are_enabled(self, node, host, setup):
         # TODO: figure out way to paramaterize node['osds'] for this test
         for osd in setup["osds"]:
@@ -42,13 +41,13 @@ class TestOSDs(object):
             )
             assert host.mount_point(osd_path).exists
 
-    @pytest.mark.lvm_scenario
+    @pytest.mark.no_docker
     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):
-        host.exists('ceph-volume-systemd')
+        assert host.exists('ceph-volume-systemd')
 
     def _get_osd_id_from_host(self, node, osd_tree):
         children = []