Hi,
attached patch provides solution for
https://fedorahosted.org/freeipa/ticket/5839 by removing all
certificates added to local host during tests.
Lenka
From 031adf1f50308b70e87c93a7a853f04eae593bf0 Mon Sep 17 00:00:00 2001
From: Lenka Doudova <ldoud...@redhat.com>
Date: Mon, 2 May 2016 14:04:24 +0200
Subject: [PATCH] Test fix: Cleanup for host certificate
This fix provides means to remove certificates from host that were added during tests, but not removed.
Ticket: https://fedorahosted.org/freeipa/ticket/5839
---
ipatests/test_xmlrpc/test_host_plugin.py | 4 ++--
ipatests/test_xmlrpc/tracker/host_plugin.py | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py
index 47f05a403ddb519f201b11251c2acb71faa9133b..b62ce32a2206b489bdc9cdf32851f6101b004218 100644
--- a/ipatests/test_xmlrpc/test_host_plugin.py
+++ b/ipatests/test_xmlrpc/test_host_plugin.py
@@ -130,9 +130,9 @@ def this_host(request):
"""Fixture for the current master"""
tracker = HostTracker(name=api.env.host.partition('.')[0],
fqdn=api.env.host)
- # This host is not created/deleted, so don't call make_fixture
tracker.exists = True
- return tracker
+ # Fixture ensures that any certificates added to this_host are removed
+ return tracker.make_fixture_certcleanup(request)
@pytest.fixture(scope='class')
diff --git a/ipatests/test_xmlrpc/tracker/host_plugin.py b/ipatests/test_xmlrpc/tracker/host_plugin.py
index bf199f4f50820fe27384eea4897b73bd02391c56..a7f0445fe4119c525d481eb8eab7e5cea36706c9 100644
--- a/ipatests/test_xmlrpc/tracker/host_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/host_plugin.py
@@ -10,6 +10,7 @@ from ipatests.test_xmlrpc.tracker.base import Tracker
from ipatests.test_xmlrpc.xmlrpc_test import fuzzy_uuid
from ipatests.test_xmlrpc import objectclasses
from ipatests.util import assert_deepequal
+from ipalib import errors
class HostTracker(Tracker):
@@ -152,3 +153,22 @@ class HostTracker(Tracker):
summary=u'Modified host "%s"' % self.fqdn,
result=self.filter_attrs(self.update_keys | set(extra_keys))
), result)
+
+ def make_fixture_certcleanup(self, request):
+ """ Fixture to cleanup certificate from local host """
+ cleanup_command = self.make_update_command(
+ updates={'usercertificate':''})
+ try:
+ cleanup_command()
+ except errors.EmptyModlist:
+ pass
+
+ def cleanup():
+ try:
+ cleanup_command()
+ except errors.EmptyModlist:
+ pass
+
+ request.addfinalizer(cleanup)
+
+ return self
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
