90 lines
3.8 KiB
Diff
90 lines
3.8 KiB
Diff
|
From eac03d6828d0bac1925c897090fc77e250eaee04 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anuja More <amore@redhat.com>
|
||
|
|
Date: Thu, 5 Aug 2021 12:27:38 +0530
|
||
|
|
Subject: [PATCH] ipatests: Refactor test_check_otpd_after_idle_timeout
|
||
|
|
|
||
|
|
Use whole date when calling journalctl --since
|
||
|
|
ipa-otpd don't flush its logs to syslog immediately,
|
||
|
|
so check with run_repeatedly.
|
||
|
|
Also list failed units when ldap connection is
|
||
|
|
timed out.
|
||
|
|
|
||
|
|
Related: https://pagure.io/freeipa/issue/6587
|
||
|
|
|
||
|
|
Signed-off-by: Anuja More <amore@redhat.com>
|
||
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/test_integration/test_otp.py | 31 ++++++++++++++++-----------
|
||
|
|
1 file changed, 18 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ipatests/test_integration/test_otp.py b/ipatests/test_integration/test_otp.py
|
||
|
|
index fd55898ca..353470897 100644
|
||
|
|
--- a/ipatests/test_integration/test_otp.py
|
||
|
|
+++ b/ipatests/test_integration/test_otp.py
|
||
|
|
@@ -313,6 +313,13 @@ class TestOTPToken(IntegrationTest):
|
||
|
|
|
||
|
|
@pytest.fixture
|
||
|
|
def setup_otp_nsslapd(self):
|
||
|
|
+ check_services = self.master.run_command(
|
||
|
|
+ ['systemctl', 'list-units', '--state=failed']
|
||
|
|
+ )
|
||
|
|
+ assert "0 loaded units listed" in check_services.stdout_text
|
||
|
|
+ assert "ipa-otpd" not in check_services.stdout_text
|
||
|
|
+ # Be sure no services are running and failed units
|
||
|
|
+ self.master.run_command(['killall', 'ipa-otpd'], raiseonerr=False)
|
||
|
|
# setting nsslapd-idletimeout
|
||
|
|
new_limit = 30
|
||
|
|
conn = self.master.ldap_connect()
|
||
|
|
@@ -326,13 +333,6 @@ class TestOTPToken(IntegrationTest):
|
||
|
|
nsslapd-idletimeout: {limit}
|
||
|
|
""")
|
||
|
|
tasks.ldapmodify_dm(self.master, ldap_query.format(limit=new_limit))
|
||
|
|
- # Be sure no services are running and failed units
|
||
|
|
- self.master.run_command(['killall', 'ipa-otpd'], raiseonerr=False)
|
||
|
|
- check_services = self.master.run_command(
|
||
|
|
- ['systemctl', 'list-units', '--state=failed']
|
||
|
|
- )
|
||
|
|
- assert "0 loaded units listed" in check_services.stdout_text
|
||
|
|
- assert "ipa-otpd" not in check_services.stdout_text
|
||
|
|
yield
|
||
|
|
# cleanup
|
||
|
|
tasks.ldapmodify_dm(self.master, ldap_query.format(limit=orig_limit))
|
||
|
|
@@ -346,7 +346,7 @@ class TestOTPToken(IntegrationTest):
|
||
|
|
Test to verify that when the nsslapd-idletimeout is exceeded (30s idle,
|
||
|
|
60s sleep) then the ipa-otpd process should exit without error.
|
||
|
|
"""
|
||
|
|
- since = time.strftime('%H:%M:%S')
|
||
|
|
+ since = time.strftime('%Y-%m-%d %H:%M:%S')
|
||
|
|
tasks.kinit_admin(self.master)
|
||
|
|
otpuid, totp = add_otptoken(self.master, USER, otptype="totp")
|
||
|
|
try:
|
||
|
|
@@ -354,14 +354,19 @@ class TestOTPToken(IntegrationTest):
|
||
|
|
otpvalue = totp.generate(int(time.time())).decode("ascii")
|
||
|
|
kinit_otp(self.master, USER, password=PASSWORD, otp=otpvalue)
|
||
|
|
time.sleep(60)
|
||
|
|
+
|
||
|
|
+ def test_cb(cmd_jornalctl):
|
||
|
|
+ # check if LDAP connection is timed out
|
||
|
|
+ expected_msg = "Can't contact LDAP server"
|
||
|
|
+ return expected_msg in cmd_jornalctl
|
||
|
|
+
|
||
|
|
+ # ipa-otpd don't flush its logs to syslog immediately
|
||
|
|
+ cmd = ['journalctl', '--since={}'.format(since)]
|
||
|
|
+ tasks.run_repeatedly(
|
||
|
|
+ self.master, command=cmd, test=test_cb, timeout=90)
|
||
|
|
failed_services = self.master.run_command(
|
||
|
|
['systemctl', 'list-units', '--state=failed']
|
||
|
|
)
|
||
|
|
assert "ipa-otpd" not in failed_services.stdout_text
|
||
|
|
- cmd_jornalctl = self.master.run_command(
|
||
|
|
- ['journalctl', '--since={}'.format(since)]
|
||
|
|
- )
|
||
|
|
- regex = r".*ipa-otpd@.*\sSucceeded"
|
||
|
|
- assert re.search(regex, cmd_jornalctl.stdout_text)
|
||
|
|
finally:
|
||
|
|
del_otptoken(self.master, otpuid)
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|