tests: add missing test for rbd

Add a missing test `test_rbd_mirror_service_is_running_from_luminous()`.
Also using bash -c "<cmd>" 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 <gabrioux@redhat.com>
pull/2123/head
Guillaume Abrioux 2017-10-30 19:44:56 +01:00
parent c9c278de7d
commit c28882c1cd
2 changed files with 8 additions and 1 deletions

View File

@ -30,6 +30,13 @@ class TestRbdMirrors(object):
) )
assert host.service(service_name).is_running 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.no_docker
@pytest.mark.before_luminous @pytest.mark.before_luminous
def test_rbd_mirror_service_is_enabled_before_luminous(self, node, host): def test_rbd_mirror_service_is_enabled_before_luminous(self, node, host):

View File

@ -79,7 +79,7 @@ commands=
ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ 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] [shrink-mon]
commands= commands=