Commit 0868b311 authored by Jérome Perrin's avatar Jérome Perrin

test: fix some test isolation problems in testAuthenticationPolicy

Tests should not depend on the state left by the previous test run.

This was achieved by:

* use a different preference in each method to reset the state of preferences configuration.
* clear cache after setting preferences, so that the new preference setting is used
* change password after setting the max preferred password lifetime duration, otherwise password event are not created and password is not detected as expired.
* rename test methods not to include number, we should not force test ordering, since we want tests to be independant.
* Also add one case of password actually expired
parent 943cda95
......@@ -76,7 +76,15 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
assignment = person.newContent(portal_type = 'Assignment')
assignment.open()
# Setup auth policy
# Reset and Setup auth policy
old_preference = portal.portal_catalog.getResultValue(
portal_type='System Preference',
title='Authentication')
if old_preference is not None:
old_preference.setTitle('disabled authentication preference')
old_preference.disable()
preference = portal.portal_preferences.newContent(
portal_type = 'System Preference',
title = 'Authentication',
......@@ -120,7 +128,7 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
login.validate()
return person
def test_01_BlockLogin(self):
def test_BlockLogin(self):
"""
Test that a recataloging works for Web Site documents
"""
......@@ -199,7 +207,7 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
self.assertFalse(login.isLoginBlocked())
def test_02_PasswordHistory(self):
def test_PasswordHistory(self):
"""
Test password history.
"""
......@@ -263,7 +271,7 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
[x.getPassword() for x in self._getPasswordEventList(login)])
def test_03_PasswordValidity(self):
def test_PasswordValidity(self):
"""
Test validity of a password.
"""
......@@ -498,7 +506,7 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
self.assertEqual(1, login.Login_isPasswordValid('abAB#12_', request))
self.assertEqual(1, login.Login_isPasswordValid('not_used_ALREADY_1234', request))
def test_04_PasswordExpire(self):
def test_PasswordExpire(self):
"""
Test password expire.
"""
......@@ -506,19 +514,24 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
request = self.app.REQUEST
self.assertTrue(portal.portal_preferences.isAuthenticationPolicyEnabled())
person = self.createUser('test-04',
password='used_ALREADY_1234')
login = person.objectValues(portal_type='ERP5 Login')[0]
preference = portal.portal_catalog.getResultValue(portal_type = 'System Preference',
title = 'Authentication',)
preference.setPreferredMaxPasswordLifetimeDuration(24)
self.tic()
self._clearCache()
person = self.createUser('test-04',
password='used_ALREADY_1234')
login = person.objectValues(portal_type='ERP5 Login')[0]
self.assertFalse(login.isPasswordExpired())
self.assertFalse(request['is_user_account_password_expired'])
# Check password expired
preference.setPreferredMaxPasswordLifetimeDuration(0) # password expire immediatly (just to check isExpired)
self.tic()
self._clearCache()
self.assertTrue(login.isPasswordExpired())
# set longer password validity interval
preference.setPreferredMaxPasswordLifetimeDuration(4*24) # password expire in 4 days
......@@ -541,18 +554,23 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
self.assertFalse(login.isPasswordExpired())
self.assertFalse(request['is_user_account_password_expired_expire_date'])
def test_05_HttpRequest(self):
def test_HttpRequest(self):
"""
Check HTTP responses
"""
portal = self.getPortal()
request = self.app.REQUEST
preference = portal.portal_catalog.getResultValue(portal_type = 'System Preference',
title = 'Authentication',)
preference.setPreferredMaxPasswordLifetimeDuration(24)
self._clearCache()
self.tic()
person = self.createUser('test-05')
assignment = person.newContent(portal_type = 'Assignment')
assignment.open()
login = person.objectValues(portal_type='ERP5 Login')[0]
preference = portal.portal_catalog.getResultValue(portal_type = 'System Preference',
title = 'Authentication',)
login.setPassword('used_ALREADY_1234')
self.tic()
......@@ -612,7 +630,7 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
response = self.publish(path)
self.assertTrue('Welcome to ERP5' in response.getBody())
def test_06_ExpireOldAuthenticationEventList(self):
def test_ExpireOldAuthenticationEventList(self):
"""
Check that expiring old Authentication Event list works.
"""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment