From 64c5340329b8eeaf7d8995a3c86b9bdf10ea9252 Mon Sep 17 00:00:00 2001 From: Ganna Kaihorodova Date: Fri, 12 Aug 2016 13:14:10 +0200 Subject: [PATCH] Fix for integration tests replication layouts Domain level 0 doesn't allow to create replica file on CA-less master, testcases were skipped with Domain level 0 [https://fedorahosted.org/freeipa/ticket/6134] Reviewed-By: Martin Basti Reviewed-By: Petr Spacek --- ipatests/test_integration/test_replication_layouts.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ipatests/test_integration/test_replication_layouts.py b/ipatests/test_integration/test_replication_layouts.py index 9fd4ddca2..c17881530 100644 --- a/ipatests/test_integration/test_replication_layouts.py +++ b/ipatests/test_integration/test_replication_layouts.py @@ -3,10 +3,13 @@ # import time - +import pytest +from ipalib.constants import DOMAIN_LEVEL_0 +from ipatests.test_integration.env_config import get_global_config from ipatests.test_integration.base import IntegrationTest from ipatests.test_integration import tasks +config = get_global_config() class LayoutsBaseTest(IntegrationTest): @@ -27,6 +30,8 @@ class LayoutsBaseTest(IntegrationTest): r.run_command(['ipa', 'user-show', test_user]) +@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, + reason='does not work on DOMAIN_LEVEL_0 by design') class TestLineTopologyWithoutCA(LayoutsBaseTest): num_replicas = 3 @@ -87,6 +92,8 @@ class TestCompleteTopologyWithCA(LayoutsBaseTest): self.replication_is_working() +@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, + reason='does not work on DOMAIN_LEVEL_0 by design') class Test2ConnectedTopologyWithoutCA(LayoutsBaseTest): num_replicas = 33 @@ -105,6 +112,8 @@ class Test2ConnectedTopologyWithCA(LayoutsBaseTest): self.replication_is_working() +@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, + reason='does not work on DOMAIN_LEVEL_0 by design') class TestDoubleCircleTopologyWithoutCA(LayoutsBaseTest): num_replicas = 29