86baa9
From 853b56f4096734c47a26cf11767a7d6d582b11eb Mon Sep 17 00:00:00 2001
86baa9
From: Rob Crittenden <rcritten@redhat.com>
86baa9
Date: Mon, 25 Jun 2018 17:04:16 -0400
86baa9
Subject: [PATCH] Extend CALessBase::installer_server to accept extra_args
86baa9
86baa9
Allow callers to pass abitrary extra arguments to the installer.
86baa9
86baa9
This is useful when using a CALess installation in order to
86baa9
speed up tests that require a full install but do not require
86baa9
a full PKI.
86baa9
86baa9
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
86baa9
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
86baa9
Reviewed-By: Christian Heimes <cheimes@redhat.com>
86baa9
---
86baa9
 ipatests/test_integration/test_caless.py | 16 +++++++++++-----
86baa9
 1 file changed, 11 insertions(+), 5 deletions(-)
86baa9
86baa9
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
86baa9
index ff8d95caa6fed00d3876f1d08e2170a9587a6d86..1ebe8fa368b88e949c0bd30bfc3999bf15c4df66 100644
86baa9
--- a/ipatests/test_integration/test_caless.py
86baa9
+++ b/ipatests/test_integration/test_caless.py
86baa9
@@ -171,7 +171,7 @@ class CALessBase(IntegrationTest):
86baa9
                        http_pin=_DEFAULT, dirsrv_pin=_DEFAULT, pkinit_pin=None,
86baa9
                        root_ca_file='root.pem', pkinit_pkcs12_exists=False,
86baa9
                        pkinit_pkcs12='server-kdc.p12', unattended=True,
86baa9
-                       stdin_text=None):
86baa9
+                       stdin_text=None, extra_args=None):
86baa9
         """Install a CA-less server
86baa9
 
86baa9
         Return value is the remote ipa-server-install command
86baa9
@@ -179,10 +179,16 @@ class CALessBase(IntegrationTest):
86baa9
         if host is None:
86baa9
             host = cls.master
86baa9
 
86baa9
-        extra_args = ['--http-cert-file', http_pkcs12,
86baa9
-                      '--dirsrv-cert-file', dirsrv_pkcs12,
86baa9
-                      '--ca-cert-file', root_ca_file,
86baa9
-                      '--ip-address', host.ip]
86baa9
+        std_args = [
86baa9
+            '--http-cert-file', http_pkcs12,
86baa9
+            '--dirsrv-cert-file', dirsrv_pkcs12,
86baa9
+            '--ca-cert-file', root_ca_file,
86baa9
+            '--ip-address', host.ip
86baa9
+        ]
86baa9
+        if extra_args:
86baa9
+            extra_args.extend(std_args)
86baa9
+        else:
86baa9
+            extra_args = std_args
86baa9
 
86baa9
         if http_pin is _DEFAULT:
86baa9
             http_pin = cls.cert_password
86baa9
-- 
86baa9
2.20.1
86baa9