From b08c75f92a590fd01743742b78423fe2ce7b1bc5 Mon Sep 17 00:00:00 2001 From: George Pantelakis Date: Tue, 25 Jun 2024 14:12:14 +0200 Subject: [PATCH] Change password expect to regex --- Kerberos/test_kerberos_ssh_login.py | 2 +- Kerberos/test_kerberos_user_change_password.py | 2 +- Local-user/test_local_user_passwd.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kerberos/test_kerberos_ssh_login.py b/Kerberos/test_kerberos_ssh_login.py index e93abf7..f3ec0fd 100644 --- a/Kerberos/test_kerberos_ssh_login.py +++ b/Kerberos/test_kerberos_ssh_login.py @@ -67,7 +67,7 @@ def test_krb_change_passwd_ssh(ipa_user, user_shell, ipa_login): user_shell.expect_exact(ipa_user.username) user_shell.sendline(f"passwd") if isDistro(['rhel', 'centos'], '>=10') or isDistro('fedora', '>=40'): - user_shell.expect_exact(f"Current password") + user_shell.expect(r"[cC]urrent [pP]assword") else: user_shell.expect_exact(f"Changing password for user {ipa_user.username}.") diff --git a/Kerberos/test_kerberos_user_change_password.py b/Kerberos/test_kerberos_user_change_password.py index db6ae6c..620aa36 100644 --- a/Kerberos/test_kerberos_user_change_password.py +++ b/Kerberos/test_kerberos_user_change_password.py @@ -68,6 +68,6 @@ def test_kerberos_change_passwd(ipa_user, user_shell, required, insert, expect, user_shell.expect_exact(expect) user_shell.sendline(secret) if isDistro(['rhel', 'centos'], '>=10') or isDistro('fedora', '>=40'): - user_shell.expect_exact(f"Current password") + user_shell.expect(r"[cC]urrent [pP]assword") else: user_shell.expect_exact(f"Changing password for user {ipa_user.username}.") diff --git a/Local-user/test_local_user_passwd.py b/Local-user/test_local_user_passwd.py index 1a0baa2..b93c397 100644 --- a/Local-user/test_local_user_passwd.py +++ b/Local-user/test_local_user_passwd.py @@ -47,6 +47,6 @@ def test_change_local_user_passwd(local_user, user_shell, required, lock_on_remo user_shell.expect_exact(f"PIN for {local_user.username}:") user_shell.sendline(local_user.pin) if isDistro(['rhel', 'centos'], '>=10') or isDistro('fedora', '>=40'): - user_shell.expect_exact(f"Current password") + user_shell.expect(r"[cC]urrent [pP]assword") else: user_shell.expect_exact(f"Changing password for user {local_user.username}.")