From c28882c1cdfa0420f3dd51542b577f2ab917e5d3 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 30 Oct 2017 19:44:56 +0100 Subject: [PATCH] tests: add missing test for rbd Add a missing test `test_rbd_mirror_service_is_running_from_luminous()`. Also using bash -c "" to make testinfra aware that later in the upgrade process we are now running `luminous` ceph release so we must skip the rbd tests related to `jewel` ceph release. Signed-off-by: Guillaume Abrioux --- tests/functional/tests/rbd-mirror/test_rbd_mirror.py | 7 +++++++ tox.ini | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/functional/tests/rbd-mirror/test_rbd_mirror.py b/tests/functional/tests/rbd-mirror/test_rbd_mirror.py index 69a9924ee..e195f41e8 100644 --- a/tests/functional/tests/rbd-mirror/test_rbd_mirror.py +++ b/tests/functional/tests/rbd-mirror/test_rbd_mirror.py @@ -30,6 +30,13 @@ class TestRbdMirrors(object): ) assert host.service(service_name).is_running + @pytest.mark.from_luminous + def test_rbd_mirror_service_is_running_from_luminous(self, node, host): + service_name = "ceph-rbd-mirror@rbd-mirror.{hostname}".format( + hostname=node["vars"]["inventory_hostname"] + ) + assert host.service(service_name).is_running + @pytest.mark.no_docker @pytest.mark.before_luminous def test_rbd_mirror_service_is_enabled_before_luminous(self, node, host): diff --git a/tox.ini b/tox.ini index bf25fa2fb..cc4b7212d 100644 --- a/tox.ini +++ b/tox.ini @@ -79,7 +79,7 @@ commands= ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ " - testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:luminous} testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests" [shrink-mon] commands=