From b689ba7e10f46e1bbff187348bae5e2f58315ec7 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Mon, 10 Sep 2018 16:07:59 +0200 Subject: [PATCH] Remove DL0 specific code from ipatests/test_integration/test_caless.py See: https://pagure.io/freeipa/issue/7689 Signed-off-by: Thomas Woerner Reviewed-By: Alexander Bokovoy --- ipatests/test_integration/test_caless.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index ec8dd1076..88295f0e5 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -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"""