URL: https://github.com/freeipa/freeipa/pull/1235
Author: tomaskrizek
Title: #1235: [Backport][ipa-4-6] prci: add external_ca test
Action: opened
PR body:
"""
This PR was opened automatically because PR #1027 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/1235/head:pr1235
git checkout pr1235
From 97b06a6de943306d6cae0c1cba583c88ee19e596 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tkri...@redhat.com>
Date: Thu, 31 Aug 2017 14:49:45 +0200
Subject: [PATCH 1/2] prci: add external_ca test
Add external_ca to the PR CI test suite.
Signed-off-by: Tomas Krizek <tkri...@redhat.com>
---
.freeipa-pr-ci.yaml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index c7f9a97c34..828cdd1a25 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -33,3 +33,14 @@ jobs:
test_suite: test_integration/test_caless.py::TestServerReplicaCALessToCAFull
template: *ci-master-f26
timeout: 3600
+
+ fedora-26/external_ca:
+ requires: [fedora-26/build]
+ priority: 50
+ job:
+ class: RunPytest
+ args:
+ build_url: '{fedora-26/build_url}'
+ test_suite: test_integration/test_external_ca.py::TestExternalCA
+ template: *ci-master-f26
+ timeout: 3600
From 6356ea97998ddc175536d0ea20b9a6dcae485d5a Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tkri...@redhat.com>
Date: Wed, 6 Sep 2017 17:22:19 +0200
Subject: [PATCH 2/2] ipatests: collect logs for external_ca test suite
Since test_external_ca isn't using the multihost framework,
logs collection has to be set up explicitly.
Signed-off-by: Tomas Krizek <tkri...@redhat.com>
---
ipatests/test_integration/test_external_ca.py | 2 ++
ipatests/util.py | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/ipatests/test_integration/test_external_ca.py b/ipatests/test_integration/test_external_ca.py
index 967a8dd834..9c849e0943 100644
--- a/ipatests/test_integration/test_external_ca.py
+++ b/ipatests/test_integration/test_external_ca.py
@@ -20,12 +20,14 @@
from ipatests.pytest_plugins.integration import tasks
from ipatests.test_integration.base import IntegrationTest
from ipatests.test_integration.create_external_ca import ExternalCA
+from ipatests.util import collect_logs
class TestExternalCA(IntegrationTest):
"""
Test of FreeIPA server installation with exernal CA
"""
+ @collect_logs
def test_external_ca(self):
# Step 1 of ipa-server-install
self.master.run_command([
diff --git a/ipatests/util.py b/ipatests/util.py
index bc33a14970..2564459a8e 100644
--- a/ipatests/util.py
+++ b/ipatests/util.py
@@ -43,6 +43,9 @@
from ipalib.request import context
from ipapython.dn import DN
from ipapython.ipautil import run
+from ipatests.pytest_plugins.integration.tasks import (
+ setup_server_logs_collecting)
+
try:
# not available with client-only wheel packages
@@ -852,3 +855,19 @@ def get_group_dn(cn):
def get_user_dn(uid):
return DN(('uid', uid), api.env.container_user, api.env.basedn)
+
+
+def collect_logs(func):
+ def wrapper(*args):
+ try:
+ func(*args)
+ finally:
+ if hasattr(args[0], 'master'):
+ setup_server_logs_collecting(args[0].master)
+ if hasattr(args[0], 'replicas') and args[0].replicas:
+ for replica in args[0].replicas:
+ setup_server_logs_collecting(replica)
+ if hasattr(args[0], 'clients') and args[0].clients:
+ for client in args[0].clients:
+ setup_server_logs_collecting(client)
+ return wrapper
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
