IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Break out of teardown in test_replica_promotion.py if no config

Browse Source 
These tests are all skipped if there is no YAML configuration
file passed but the teardown method is always called and since
there is a reference to the Config object this blows up if just
ipa-run-tests is executed.

Look at the config and break out if no domains are set.

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Tibor Dudlak <tdudlak@redhat.com>
This commit is contained in:
Rob Crittenden
2018-04-04 11:39:40 -04:00
committed by Tibor Dudlák
parent 28acbc6c11
commit 7b546ffedb
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipatests/test_integration/test_replica_promotion.py
View File

@@ -11,10 +11,13 @@ from ipatests.test_integration.base import IntegrationTest
from ipatests.pytest_plugins.integration import tasks from ipatests.pytest_plugins.integration import tasks
from ipatests.pytest_plugins.integration.tasks import ( from ipatests.pytest_plugins.integration.tasks import (
assert_error, replicas_cleanup) assert_error, replicas_cleanup)
from ipatests.pytest_plugins.integration.env_config import get_global_config
from ipalib.constants import ( from ipalib.constants import (
DOMAIN_LEVEL_0, DOMAIN_LEVEL_1, DOMAIN_SUFFIX_NAME, IPA_CA_NICKNAME) DOMAIN_LEVEL_0, DOMAIN_LEVEL_1, DOMAIN_SUFFIX_NAME, IPA_CA_NICKNAME)
from ipaplatform.paths import paths from ipaplatform.paths import paths
config = get_global_config()
class ReplicaPromotionBase(IntegrationTest): class ReplicaPromotionBase(IntegrationTest):
@@ -404,6 +407,9 @@ class TestWrongClientDomain(IntegrationTest):
tasks.install_master(cls.master, domain_level=cls.domain_level) tasks.install_master(cls.master, domain_level=cls.domain_level)
def teardown_method(self, method): def teardown_method(self, method):
if len(config.domains) == 0:
# No YAML config was set
return
self.replicas[0].run_command(['ipa-client-install', self.replicas[0].run_command(['ipa-client-install',
'--uninstall', '-U'], '--uninstall', '-U'],
raiseonerr=False) raiseonerr=False)