From cfd945bb09519bc0b65ef1bd5f229b82690b3292 Mon Sep 17 00:00:00 2001 From: Amita Sharma Date: Fri, 27 Oct 2017 15:08:03 +0530 Subject: [PATCH] Issue lib389 3 - Python 3 support for pwdPolicy_controls_test.py Bug Description: password/pwdPolicy_controls_test.py tests did not support python 3 Fix Description: use byte type for the LDAP values and fix LDAPError https://pagure.io/lib389/issue/3 Reviewed by: ??? --- .../suites/password/pwdPolicy_controls_test.py | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py index d0b5ae0..eb6a08f 100644 --- a/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py +++ b/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py @@ -16,7 +16,7 @@ else: log = logging.getLogger(__name__) USER_DN = 'uid=test entry,dc=example,dc=com' -USER_PW = 'password123' +USER_PW = b'password123' @pytest.fixture @@ -73,10 +73,10 @@ def bind_and_get_control(topo, err=0): assert False except ldap.LDAPError as e: if err: - log.debug('Got expected error: {}'.format(e.message['desc'])) + log.debug('Got expected error: {}'.format(str(e))) pass else: - log.fatal('Did not expect an error: {}'.format(e.message['desc'])) + log.fatal('Did not expect an error: {}'.format(str(e))) assert False if DEBUGGING and res_ctrls and len(res_ctrls) > 0: @@ -109,11 +109,11 @@ def test_pwd_must_change(topo, init_user): log.info('Configure password policy with paswordMustChange set to "on"') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordExp', 'on'), - (ldap.MOD_REPLACE, 'passwordMaxAge', '200'), - (ldap.MOD_REPLACE, 'passwordGraceLimit', '0'), - (ldap.MOD_REPLACE, 'passwordWarning', '199'), - (ldap.MOD_REPLACE, 'passwordMustChange', 'on')]) + (ldap.MOD_REPLACE, 'passwordExp', b'on'), + (ldap.MOD_REPLACE, 'passwordMaxAge', b'200'), + (ldap.MOD_REPLACE, 'passwordGraceLimit', b'0'), + (ldap.MOD_REPLACE, 'passwordWarning', b'199'), + (ldap.MOD_REPLACE, 'passwordMustChange', b'on')]) except ldap.LDAPError as e: log.error("Failed to set password policy, error: {}".format(e.message['desc'])) assert False @@ -164,9 +164,9 @@ def test_pwd_expired_grace_limit(topo, init_user): log.info('Configure password policy with grace limit set tot 2') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordExp', 'on'), - (ldap.MOD_REPLACE, 'passwordMaxAge', '5'), - (ldap.MOD_REPLACE, 'passwordGraceLimit', '2')]) + (ldap.MOD_REPLACE, 'passwordExp', b'on'), + (ldap.MOD_REPLACE, 'passwordMaxAge', b'5'), + (ldap.MOD_REPLACE, 'passwordGraceLimit', b'2')]) except ldap.LDAPError as e: log.error("Failed to set password policy, error: {}".format(e.message['desc'])) assert False @@ -216,9 +216,9 @@ def test_pwd_expiring_with_warning(topo, init_user): log.info('Configure password policy') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordExp', 'on'), - (ldap.MOD_REPLACE, 'passwordMaxAge', '50'), - (ldap.MOD_REPLACE, 'passwordWarning', '50')]) + (ldap.MOD_REPLACE, 'passwordExp',b'on'), + (ldap.MOD_REPLACE, 'passwordMaxAge',b'50'), + (ldap.MOD_REPLACE, 'passwordWarning',b'50')]) except ldap.LDAPError as e: log.error("Failed to set password policy, error: {}".format(e.message['desc'])) assert False @@ -265,9 +265,9 @@ def test_pwd_expiring_with_no_warning(topo, init_user): log.info('Configure password policy') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordExp', 'on'), - (ldap.MOD_REPLACE, 'passwordMaxAge', '50'), - (ldap.MOD_REPLACE, 'passwordWarning', '5')]) + (ldap.MOD_REPLACE, 'passwordExp',b'on'), + (ldap.MOD_REPLACE, 'passwordMaxAge',b'50'), + (ldap.MOD_REPLACE, 'passwordWarning',b'5')]) except ldap.LDAPError as e: log.error("Failed to set password policy, error: {}".format(e.message['desc'])) assert False @@ -282,7 +282,7 @@ def test_pwd_expiring_with_no_warning(topo, init_user): log.info('Turn on sending expiring control regardless of warning') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordSendExpiringTime', 'on')]) + (ldap.MOD_REPLACE, 'passwordSendExpiringTime',b'on')]) except ldap.LDAPError as e: log.error("Failed to set passwordSendExpiringTime, error: {}".format(e.message['desc'])) assert False @@ -310,7 +310,7 @@ def test_pwd_expiring_with_no_warning(topo, init_user): log.info('Turn off sending expiring control (restore the default setting)') try: topo.standalone.modify_s(DN_CONFIG, [ - (ldap.MOD_REPLACE, 'passwordSendExpiringTime', 'off')]) + (ldap.MOD_REPLACE, 'passwordSendExpiringTime', b'off')]) except ldap.LDAPError as e: log.error("Failed to set passwordSendExpiringTime, error: {}".format(e.message['desc'])) assert False @@ -321,4 +321,3 @@ if __name__ == '__main__': # -s for DEBUG mode CURRENT_FILE = os.path.realpath(__file__) pytest.main("-s %s" % CURRENT_FILE) - -- 2.9.5