Remove DL0 specific code from ipatests/test_integration/test_caless.py

See: https://pagure.io/freeipa/issue/7689
Signed-off-by: Thomas Woerner <twoerner@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Thomas Woerner 2018-09-10 16:07:59 +02:00
parent 7eb8695e84
commit b689ba7e10

View File

@ -315,23 +315,13 @@ class CALessBase(IntegrationTest):
if pkinit_pin is not None:
extra_args.extend(['--pkinit-pin', dirsrv_pin])
if domain_level == DOMAIN_LEVEL_0:
result = tasks.replica_prepare(master, replica,
extra_args=extra_args,
raiseonerr=False,
stdin_text=stdin_text)
else:
result = tasks.install_replica(master, replica, setup_ca=False,
extra_args=extra_args,
unattended=unattended,
stdin_text=stdin_text,
raiseonerr=False)
result = tasks.install_replica(master, replica, setup_ca=False,
extra_args=extra_args,
unattended=unattended,
stdin_text=stdin_text,
raiseonerr=False)
return result
def get_replica_filename(self, replica):
return os.path.join(replica.config.test_dir,
'replica-info.gpg')
@classmethod
def create_pkcs12(cls, nickname, filename='server.p12', password=None):
"""Create a cert chain and generate pkcs12 cert"""