From 8b2edd5b4e13cb7a8b9b9eec4a0e194b4e6ca71b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 31 May 2022 08:52:08 -0400 Subject: [PATCH] Don't duplicate the LDAP gracelimit set in the previous test Remove a duplicated policy change which sets the gracelimit to 3. We don't typically run tests individually but as a whole. If we ever need to call this one test directly we can ignore failures. Fixes: https://pagure.io/freeipa/issue/9167 Signed-off-by: Rob Crittenden Reviewed-By: Florence Blanc-Renaud --- ipatests/test_integration/test_pwpolicy.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/ipatests/test_integration/test_pwpolicy.py b/ipatests/test_integration/test_pwpolicy.py index 718acd7d5..6d6698284 100644 --- a/ipatests/test_integration/test_pwpolicy.py +++ b/ipatests/test_integration/test_pwpolicy.py @@ -312,10 +312,6 @@ class TestPWPolicy(IntegrationTest): dn = "uid={user},cn=users,cn=accounts,{base_dn}".format( user=USER, base_dn=str(self.master.domain.basedn)) - self.master.run_command( - ["ipa", "pwpolicy-mod", POLICY, "--gracelimit", "3", ], - ) - # Resetting the password will mark it as expired self.reset_password(self.master) @@ -330,24 +326,18 @@ class TestPWPolicy(IntegrationTest): result = tasks.ldapsearch_dm( self.master, dn, ['passwordgraceusertime',], ) - assert 'passwordgraceusertime: 2' in result.stdout_text.lower() + assert 'passwordgraceusertime: 3' in result.stdout_text.lower() result = tasks.ldapsearch_dm( self.replicas[0], dn, ['passwordgraceusertime',], ) - assert 'passwordgraceusertime: 0' in result.stdout_text.lower() - - self.reset_password(self.master) + # Never been set at all so won't return + assert 'passwordgraceusertime' not in result.stdout_text.lower() # Resetting the password should reset passwordgraceusertime + self.reset_password(self.master) result = tasks.ldapsearch_dm( self.master, dn, ['passwordgraceusertime',], ) assert 'passwordgraceusertime: 0' in result.stdout_text.lower() self.reset_password(self.master) - - result = tasks.ldapsearch_dm( - self.replicas[0], dn, ['passwordgraceusertime',], - ) - assert 'passwordgraceusertime: 0' in result.stdout_text.lower() - self.reset_password(self.master)