From 14c7619284c5d29507b74d87c01b7c2d362be5c5 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Tue, 6 Aug 2019 16:00:24 -0400
Subject: [PATCH 4/8] Create a default set of mock to always apply to all test
cases
There are some common cases related to initialization where it makes
sense to centralize them in the base class.
---
tests/base.py | 15 ++++++++++++-
tests/test_dogtag_ca.py | 2 --
tests/test_dogtag_connectivity.py | 2 --
tests/test_ds_replication.py | 7 +-----
tests/test_ipa_agent.py | 2 --
tests/test_ipa_certfile_expiration.py | 2 --
tests/test_ipa_certmonger_ca.py | 2 --
tests/test_ipa_dna.py | 7 +-----
tests/test_ipa_expiration.py | 2 --
tests/test_ipa_nssdb.py | 2 --
tests/test_ipa_nssvalidation.py | 2 --
tests/test_ipa_opensslvalidation.py | 2 --
tests/test_ipa_revocation.py | 2 --
tests/test_ipa_roles.py | 12 +---------
tests/test_ipa_topology.py | 6 -----
tests/test_ipa_tracking.py | 2 --
tests/test_ipa_trust.py | 32 ---------------------------
tests/test_meta_services.py | 6 -----
18 files changed, 17 insertions(+), 90 deletions(-)
diff --git a/tests/base.py b/tests/base.py
index 9a54941..8b9e37c 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -17,18 +17,31 @@ class BaseTest(TestCase):
If a test needs a particular value then it will need to use
@patch individually.
+
+ A default set of Mock patches is set because they apply to all or
+ nearly all test cases.
"""
+ default_patches = {
+ 'ipaserver.install.installutils.check_server_configuration':
+ mock.Mock(return_value=None),
+ }
+ patches = {}
def setup_class(self):
# collect the list of patches to be applied for this class of
# tests
+ self.default_patches.update(self.patches)
+
self.applied_patches = [
- mock.patch(patch, data) for patch, data in self.patches.items()
+ mock.patch(patch, data) for patch, data in
+ self.default_patches.items()
]
for patch in self.applied_patches:
patch.start()
+ self.results = None
+
def teardown_class(self):
mock.patch.stopall()
diff --git a/tests/test_dogtag_ca.py b/tests/test_dogtag_ca.py
index 5c7faed..b5c5351 100644
--- a/tests/test_dogtag_ca.py
+++ b/tests/test_dogtag_ca.py
@@ -37,8 +37,6 @@ class mock_CertDB:
class TestCACerts(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.cainstance.CAInstance':
Mock(return_value=CAInstance()),
'ipaserver.install.krainstance.KRAInstance':
diff --git a/tests/test_dogtag_connectivity.py b/tests/test_dogtag_connectivity.py
index ad57bdf..544e325 100644
--- a/tests/test_dogtag_connectivity.py
+++ b/tests/test_dogtag_connectivity.py
@@ -14,8 +14,6 @@ from ipalib.errors import CertificateOperationError
class TestCAConnectivity(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.cainstance.CAInstance':
Mock(return_value=CAInstance()),
}
diff --git a/tests/test_ds_replication.py b/tests/test_ds_replication.py
index dd2bfc9..b6b3652 100644
--- a/tests/test_ds_replication.py
+++ b/tests/test_ds_replication.py
@@ -4,7 +4,7 @@
import pytest
from base import BaseTest
-from unittest.mock import Mock, patch
+from unittest.mock import patch
from util import capture_results, m_api
from ipahealthcheck.core import config, constants
@@ -37,11 +37,6 @@ class mock_ldap:
class TestReplicationConflicts(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
@pytest.mark.skipif(NUM_VERSION < 40790,
reason="no way of currently testing this")
@patch('ipapython.ipaldap.LDAPClient.from_realm')
diff --git a/tests/test_ipa_agent.py b/tests/test_ipa_agent.py
index f614bb1..c58c7a6 100644
--- a/tests/test_ipa_agent.py
+++ b/tests/test_ipa_agent.py
@@ -56,8 +56,6 @@ class mock_ldap_conn:
class TestNSSAgent(BaseTest):
cert = IPACertificate()
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
'ipaserver.install.cainstance.CAInstance':
diff --git a/tests/test_ipa_certfile_expiration.py b/tests/test_ipa_certfile_expiration.py
index 61cb29b..d5601c5 100644
--- a/tests/test_ipa_certfile_expiration.py
+++ b/tests/test_ipa_certfile_expiration.py
@@ -24,8 +24,6 @@ class IPACertificate:
class TestIPACertificateFile(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipahealthcheck.ipa.certs.get_expected_requests':
Mock(return_value=get_expected_requests()),
'ipalib.install.certmonger._cm_dbus_object':
diff --git a/tests/test_ipa_certmonger_ca.py b/tests/test_ipa_certmonger_ca.py
index ac56a60..4eec1ba 100644
--- a/tests/test_ipa_certmonger_ca.py
+++ b/tests/test_ipa_certmonger_ca.py
@@ -12,8 +12,6 @@ from unittest.mock import Mock, patch
class TestCertmonger(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.cainstance.CAInstance':
Mock(return_value=CAInstance()),
}
diff --git a/tests/test_ipa_dna.py b/tests/test_ipa_dna.py
index 3d5dd3e..5450642 100644
--- a/tests/test_ipa_dna.py
+++ b/tests/test_ipa_dna.py
@@ -3,7 +3,7 @@
#
from base import BaseTest
-from unittest.mock import Mock, patch
+from unittest.mock import patch
from util import capture_results
from ipahealthcheck.core import config, constants
@@ -27,11 +27,6 @@ class mock_ReplicationManager:
class TestDNARange(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
@patch('ipaserver.install.replication.ReplicationManager')
def test_dnarange_set(self, mock_manager):
mock_manager.return_value = mock_ReplicationManager(start=1, max=100)
diff --git a/tests/test_ipa_expiration.py b/tests/test_ipa_expiration.py
index f29f319..4c177f8 100644
--- a/tests/test_ipa_expiration.py
+++ b/tests/test_ipa_expiration.py
@@ -17,8 +17,6 @@ from datetime import datetime, timedelta, timezone
class TestExpiration(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipahealthcheck.ipa.certs.get_expected_requests':
Mock(return_value=get_expected_requests()),
'ipalib.install.certmonger._cm_dbus_object':
diff --git a/tests/test_ipa_nssdb.py b/tests/test_ipa_nssdb.py
index 67b9a55..7d5664e 100644
--- a/tests/test_ipa_nssdb.py
+++ b/tests/test_ipa_nssdb.py
@@ -28,8 +28,6 @@ def my_unparse_trust_flags(trust_flags):
class TestNSSDBTrust(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.cainstance.CAInstance':
Mock(return_value=CAInstance()),
'ipapython.certdb.unparse_trust_flags':
diff --git a/tests/test_ipa_nssvalidation.py b/tests/test_ipa_nssvalidation.py
index ba93ba5..1e567d8 100644
--- a/tests/test_ipa_nssvalidation.py
+++ b/tests/test_ipa_nssvalidation.py
@@ -19,8 +19,6 @@ class DsInstance:
class TestNSSValidation(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipahealthcheck.ipa.certs.get_dogtag_cert_password':
Mock(return_value='foo'),
'ipaserver.install.dsinstance.DsInstance':
diff --git a/tests/test_ipa_opensslvalidation.py b/tests/test_ipa_opensslvalidation.py
index 74751e3..0d334cd 100644
--- a/tests/test_ipa_opensslvalidation.py
+++ b/tests/test_ipa_opensslvalidation.py
@@ -14,8 +14,6 @@ from ipapython.ipautil import _RunResult
class TestOpenSSLValidation(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.cainstance.CAInstance':
Mock(return_value=CAInstance()),
}
diff --git a/tests/test_ipa_revocation.py b/tests/test_ipa_revocation.py
index 3d1ea84..39cf3e7 100644
--- a/tests/test_ipa_revocation.py
+++ b/tests/test_ipa_revocation.py
@@ -23,8 +23,6 @@ class IPACertificate:
class TestRevocation(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipaserver.install.certs.is_ipa_issued_cert':
Mock(return_value=True),
'ipalib.x509.load_certificate_from_file':
diff --git a/tests/test_ipa_roles.py b/tests/test_ipa_roles.py
index 35c7a1d..453db06 100644
--- a/tests/test_ipa_roles.py
+++ b/tests/test_ipa_roles.py
@@ -3,7 +3,7 @@
#
from base import BaseTest
-from unittest.mock import Mock, patch
+from unittest.mock import patch
from util import capture_results, CAInstance
from util import m_api
@@ -14,11 +14,6 @@ from ipahealthcheck.ipa.roles import (IPACRLManagerCheck,
class TestCRLManagerRole(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
@patch('ipaserver.install.cainstance.CAInstance')
def test_not_crlmanager(self, mock_ca):
mock_ca.return_value = CAInstance(crlgen=False)
@@ -57,11 +52,6 @@ class TestCRLManagerRole(BaseTest):
class TestRenewalMaster(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_renewal_master_not_set(self):
framework = object()
registry.initialize(framework)
diff --git a/tests/test_ipa_topology.py b/tests/test_ipa_topology.py
index ebf7657..a4ff6d9 100644
--- a/tests/test_ipa_topology.py
+++ b/tests/test_ipa_topology.py
@@ -5,7 +5,6 @@
from util import capture_results
from util import m_api
from base import BaseTest
-from unittest.mock import Mock
from ipahealthcheck.core import config, constants
from ipahealthcheck.ipa.plugin import registry
@@ -13,11 +12,6 @@ from ipahealthcheck.ipa.topology import IPATopologyDomainCheck
class TestTopology(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_topology_ok(self):
m_api.Command.topologysuffix_verify.side_effect = [
{
diff --git a/tests/test_ipa_tracking.py b/tests/test_ipa_tracking.py
index abcb9af..c40d8f4 100644
--- a/tests/test_ipa_tracking.py
+++ b/tests/test_ipa_tracking.py
@@ -15,8 +15,6 @@ from mock_certmonger import get_expected_requests, set_requests
class TestTracking(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ipahealthcheck.ipa.certs.get_expected_requests':
Mock(return_value=get_expected_requests()),
'ipalib.install.certmonger._cm_dbus_object':
diff --git a/tests/test_ipa_trust.py b/tests/test_ipa_trust.py
index 2dcc4b3..0a1d58c 100644
--- a/tests/test_ipa_trust.py
+++ b/tests/test_ipa_trust.py
@@ -102,11 +102,6 @@ class SSSDConfig():
class TestTrustAgent(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_no_trust_agent(self):
framework = object()
registry.initialize(framework)
@@ -182,11 +177,6 @@ class TestTrustAgent(BaseTest):
class TestTrustDomains(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_no_trust_agent(self):
framework = object()
registry.initialize(framework)
@@ -371,11 +361,6 @@ class TestTrustDomains(BaseTest):
class TestTrustCatalog(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_no_trust_agent(self):
framework = object()
registry.initialize(framework)
@@ -477,8 +462,6 @@ class TestTrustCatalog(BaseTest):
class Testsidgen(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -562,8 +545,6 @@ class Testsidgen(BaseTest):
class TestTrustAgentMember(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -642,8 +623,6 @@ class TestTrustAgentMember(BaseTest):
class TestControllerPrincipal(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -724,8 +703,6 @@ class TestControllerPrincipal(BaseTest):
class TestControllerService(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -798,8 +775,6 @@ class TestControllerService(BaseTest):
class TestControllerGroupSID(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -877,8 +852,6 @@ class TestControllerGroupSID(BaseTest):
class TestControllerConf(BaseTest):
patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
'ldap.initialize':
Mock(return_value=mock_ldap_conn()),
}
@@ -922,11 +895,6 @@ class TestControllerConf(BaseTest):
class TestPackageCheck(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_agent_with_package(self):
# Note that this test assumes the import is installed
framework = object()
diff --git a/tests/test_meta_services.py b/tests/test_meta_services.py
index 0cb8f03..6fbea13 100644
--- a/tests/test_meta_services.py
+++ b/tests/test_meta_services.py
@@ -7,15 +7,9 @@ from base import BaseTest
from ipahealthcheck.ipa.plugin import registry
from ipahealthcheck.meta.services import httpd
-from unittest.mock import Mock
class TestServices(BaseTest):
- patches = {
- 'ipaserver.install.installutils.check_server_configuration':
- Mock(return_value=None),
- }
-
def test_simple_service(self):
"""
Test a service. It was chosen at random.
--
2.20.1