URL: https://github.com/freeipa/freeipa/pull/1792
Author: Tiboris
Title: #1792: [Backport][ipa-4-6] Break out of teardown in
test_replica_promotion.py if no config
Action: opened
PR body:
"""
This PR was opened automatically because PR #1775 was pushed to master and
backport to ipa-4-6 is required.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1792/head:pr1792
git checkout pr1792
From 1ff232650b602ba639fecfbb71c4ce1726733e9f Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Wed, 4 Apr 2018 11:39:40 -0400
Subject: [PATCH] Break out of teardown in test_replica_promotion.py if no
config
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 <rcrit...@redhat.com>
---
ipatests/test_integration/test_replica_promotion.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ipatests/test_integration/test_replica_promotion.py b/ipatests/test_integration/test_replica_promotion.py
index 4a31828183..7a41c6602f 100644
--- a/ipatests/test_integration/test_replica_promotion.py
+++ b/ipatests/test_integration/test_replica_promotion.py
@@ -11,10 +11,13 @@
from ipatests.pytest_plugins.integration import tasks
from ipatests.pytest_plugins.integration.tasks import (
assert_error, replicas_cleanup)
+from ipatests.pytest_plugins.integration.env_config import get_global_config
from ipalib.constants import (
DOMAIN_LEVEL_0, DOMAIN_LEVEL_1, DOMAIN_SUFFIX_NAME, IPA_CA_NICKNAME)
from ipaplatform.paths import paths
+config = get_global_config()
+
class ReplicaPromotionBase(IntegrationTest):
@@ -404,6 +407,9 @@ def install(cls, mh):
tasks.install_master(cls.master, domain_level=cls.domain_level)
def teardown_method(self, method):
+ if len(config.domains) == 0:
+ # No YAML config was set
+ return
self.replicas[0].run_command(['ipa-client-install',
'--uninstall', '-U'],
raiseonerr=False)
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
