IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-22 15:13:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: Fix usage of token_password_file

Browse Source 
There were a few hardcoded places where it was set to
/tmp/token_passwd instead of using the class variable.

Don't rely on previous running tests installing the token
password file so they can be run individually.

Fixes: https://pagure.io/freeipa/issue/9603

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Rob Crittenden 2024-07-15 10:21:28 -04:00
parent 0e4fbc3b0d
commit f03a96a7b9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipatests/test_integration/test_hsm.py
View File

@ -173,6 +173,9 @@ class BaseHSMTest(IntegrationTest):
cls.master.run_command(['usermod', 'pkiuser', '-a', '-G', 'ods']) cls.master.run_command(['usermod', 'pkiuser', '-a', '-G', 'ods'])
cls.token_name, cls.token_password = get_hsm_token(cls.master) cls.token_name, cls.token_password = get_hsm_token(cls.master)
cls.master.put_file_contents(
cls.token_password_file, cls.token_password
)
tasks.install_master( tasks.install_master(
cls.master, setup_dns=cls.master_with_dns, cls.master, setup_dns=cls.master_with_dns,
setup_kra=cls.master_with_kra, setup_kra=cls.master_with_kra,
@ -220,10 +223,6 @@ class TestHSMInstall(BaseHSMTest):
def test_hsm_install_replica0_ca_less_install(self): def test_hsm_install_replica0_ca_less_install(self):
check_version(self.master) check_version(self.master)
self.master.put_file_contents(
self.token_password_file, self.token_password
)
tasks.install_replica( tasks.install_replica(
self.master, self.replicas[0], setup_ca=False, self.master, self.replicas[0], setup_ca=False,
setup_dns=True, setup_dns=True,
@ -412,7 +411,7 @@ class TestHSMcertRenewal(BaseHSMTest):
cert = tasks.certutil_fetch_cert( cert = tasks.certutil_fetch_cert(
self.master, self.master,
paths.PKI_TOMCAT_ALIAS_DIR, paths.PKI_TOMCAT_ALIAS_DIR,
'/tmp/token_passwd', self.token_password_file,
nickname, nickname,
token_name=self.token_name, token_name=self.token_name,
) )
@ -428,13 +427,14 @@ class TestHSMcertRenewal(BaseHSMTest):
status = tasks.wait_for_request(self.master, request_id[0], 120) status = tasks.wait_for_request(self.master, request_id[0], 120)
assert status == "MONITORING" assert status == "MONITORING"
args = ['-L', '-h', self.token_name, '-f', '/tmp/token_passwd'] args = ['-L', '-h', self.token_name, '-f',
self.token_password_file,]
tasks.run_certutil(self.master, args, paths.PKI_TOMCAT_ALIAS_DIR) tasks.run_certutil(self.master, args, paths.PKI_TOMCAT_ALIAS_DIR)
cert = tasks.certutil_fetch_cert( cert = tasks.certutil_fetch_cert(
self.master, self.master,
paths.PKI_TOMCAT_ALIAS_DIR, paths.PKI_TOMCAT_ALIAS_DIR,
'/tmp/token_passwd', self.token_password_file,
nickname, nickname,
token_name=self.token_name, token_name=self.token_name,
) )