From 6035978ed9b33d38a4ae0ac7f7ed8ca9c3fc2dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 8 Jun 2018 18:01:16 +0800 Subject: [PATCH] test: only on containerized iscsi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't have the same service running on non-container for now, this will change soon but for let's only run the test on container. Signed-off-by: Sébastien Han --- tests/functional/tests/iscsi/test_iscsi.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/functional/tests/iscsi/test_iscsi.py b/tests/functional/tests/iscsi/test_iscsi.py index 171a8a681..e023c75fe 100644 --- a/tests/functional/tests/iscsi/test_iscsi.py +++ b/tests/functional/tests/iscsi/test_iscsi.py @@ -9,33 +9,47 @@ class TestiSCSIs(object): assert host.package("tcmu-runner").is_installed @pytest.mark.no_docker - def test_rbd_target_api_is_installed(self, node, host): - assert host.package("rbd-target-api").is_installed + def test_ceph_iscsi_config_is_installed(self, node, host): + assert host.package("ceph-iscsi-config").is_installed @pytest.mark.no_docker - def test_rbd_target_gw_is_installed(self, node, host): - assert host.package("rbd-target-gw").is_installed + def test_targetcli_is_installed(self, node, host): + assert host.package("targetcli").is_installed + # @pytest.mark.no_docker + # def test_rbd_target_api_is_installed(self, node, host): + # assert host.package("rbd-target-api").is_installed + + # @pytest.mark.no_docker + # def test_rbd_target_gw_is_installed(self, node, host): + # assert host.package("rbd-target-gw").is_installed + + @pytest.mark.docker def test_tcmu_runner_service_is_running(self, node, host): service_name = "tcmu-runner" assert host.service(service_name).is_running + @pytest.mark.docker def test_rbd_target_api_service_is_running(self, node, host): service_name = "rbd-target-api" assert host.service(service_name).is_running + @pytest.mark.docker def test_rbd_target_gw_service_is_running(self, node, host): service_name = "rbd-target-gw" assert host.service(service_name).is_running + @pytest.mark.docker def test_tcmu_runner_service_is_enabled(self, node, host): service_name = "tcmu-runner" assert host.service(service_name).is_enabled + @pytest.mark.docker def test_rbd_target_api_service_is_enabled(self, node, host): service_name = "rbd-target-api" assert host.service(service_name).is_enabled + @pytest.mark.docker def test_rbd_target_gw_service_is_enabled(self, node, host): service_name = "rbd-target-gw" assert host.service(service_name).is_enabled