Skip to content

Commit

Permalink
tests: skip rbdmirror tests on non-secondary daemon
Browse files Browse the repository at this point in the history
the daemon is not running on the 'primary' daemon.
Therefore, these tests are not needed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a12f67e)
(cherry picked from commit 0221997)
  • Loading branch information
guits committed Aug 4, 2022
1 parent 3ca2d7d commit dd16e49
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def node(host, request):
docker = ansible_vars.get("docker")
dashboard = ansible_vars.get("dashboard_enabled", True)
radosgw_num_instances = ansible_vars.get("radosgw_num_instances", 1)
ceph_rbd_mirror_remote_user = ansible_vars.get('ceph_rbd_mirror_remote_user', '')
ceph_release_num = {
'jewel': 10,
'kraken': 11,
Expand All @@ -128,6 +129,9 @@ def node(host, request):
request.function, group_names)
pytest.skip(reason)

if request.node.get_closest_marker('rbdmirror_secondary') and not ceph_rbd_mirror_remote_user: # noqa E501
pytest.skip('Not a valid test for a non-secondary rbd-mirror node')

if request.node.get_closest_marker('ceph_crash') and group_names in [['nfss'], ['iscsigws'], ['clients'], ['monitoring']]:
pytest.skip('Not a valid test for nfs, client or iscsigw nodes')

Expand Down
3 changes: 3 additions & 0 deletions tests/functional/tests/rbd-mirror/test_rbd_mirror.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

class TestRbdMirrors(object):

@pytest.mark.rbdmirror_secondary
@pytest.mark.no_docker
def test_rbd_mirror_is_installed(self, node, host):
assert host.package("rbd-mirror").is_installed

@pytest.mark.rbdmirror_secondary
def test_rbd_mirror_service_enabled_and_running(self, node, host):
service_name = "ceph-rbd-mirror@rbd-mirror.{hostname}".format(
hostname=node["vars"]["inventory_hostname"]
Expand All @@ -16,6 +18,7 @@ def test_rbd_mirror_service_enabled_and_running(self, node, host):
assert s.is_enabled
assert s.is_running

@pytest.mark.rbdmirror_secondary
def test_rbd_mirror_is_up(self, node, host, setup):
hostname = node["vars"]["inventory_hostname"]
cluster = setup["cluster_name"]
Expand Down

0 comments on commit dd16e49

Please sign in to comment.