From 1c82d8c4f13ebc773f71a1be8e2c8647cf24fc2b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mar 28 2019 21:12:28 +0000 Subject: Extend CALessBase::installer_server to accept extra_args Allow callers to pass abitrary extra arguments to the installer. This is useful when using a CALess installation in order to speed up tests that require a full install but do not require a full PKI. Reviewed-By: Rob Crittenden Reviewed-By: Alexander Bokovoy Reviewed-By: Christian Heimes --- diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index ff8d95c..1ebe8fa 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -171,7 +171,7 @@ class CALessBase(IntegrationTest): http_pin=_DEFAULT, dirsrv_pin=_DEFAULT, pkinit_pin=None, root_ca_file='root.pem', pkinit_pkcs12_exists=False, pkinit_pkcs12='server-kdc.p12', unattended=True, - stdin_text=None): + stdin_text=None, extra_args=None): """Install a CA-less server Return value is the remote ipa-server-install command @@ -179,10 +179,16 @@ class CALessBase(IntegrationTest): if host is None: host = cls.master - extra_args = ['--http-cert-file', http_pkcs12, - '--dirsrv-cert-file', dirsrv_pkcs12, - '--ca-cert-file', root_ca_file, - '--ip-address', host.ip] + std_args = [ + '--http-cert-file', http_pkcs12, + '--dirsrv-cert-file', dirsrv_pkcs12, + '--ca-cert-file', root_ca_file, + '--ip-address', host.ip + ] + if extra_args: + extra_args.extend(std_args) + else: + extra_args = std_args if http_pin is _DEFAULT: http_pin = cls.cert_password