Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
List overview
Download
389-commits
September 2015
----- 2025 -----
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
389-commits@lists.fedoraproject.org
4 participants
72 discussions
Start a n
N
ew thread
Branch '389-ds-base-1.3.4' - dirsrvtests/create_test.py dirsrvtests/suites dirsrvtests/tickets
by Mark Reynolds
02 Sep '15
02 Sep '15
dirsrvtests/create_test.py | 18 dirsrvtests/suites/acl/acl_test.py | 10 dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py | 14 dirsrvtests/suites/basic/basic_test.py | 60 - dirsrvtests/suites/betxns/betxn_test.py | 29 dirsrvtests/suites/config/config_test.py | 23 dirsrvtests/suites/dynamic-plugins/plugin_tests.py | 356 +++++----- dirsrvtests/suites/dynamic-plugins/stress_tests.py | 16 dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py | 14 dirsrvtests/suites/filter/filter_test.py | 10 dirsrvtests/suites/memory_leaks/range_search_test.py | 6 dirsrvtests/suites/password/password_test.py | 10 dirsrvtests/suites/password/pwdAdmin_test.py | 58 - dirsrvtests/suites/replication/cleanallruv_test.py | 100 +- dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py | 92 +- dirsrvtests/suites/schema/test_schema.py | 5 dirsrvtests/tickets/ticket365_test.py | 14 dirsrvtests/tickets/ticket47384_test.py | 16 dirsrvtests/tickets/ticket47462_test.py | 24 dirsrvtests/tickets/ticket47640_test.py | 10 dirsrvtests/tickets/ticket47653MMR_test.py | 4 dirsrvtests/tickets/ticket47669_test.py | 22 dirsrvtests/tickets/ticket47714_test.py | 12 dirsrvtests/tickets/ticket47781_test.py | 8 dirsrvtests/tickets/ticket47815_test.py | 6 dirsrvtests/tickets/ticket47819_test.py | 18 dirsrvtests/tickets/ticket47900_test.py | 40 - dirsrvtests/tickets/ticket47920_test.py | 4 dirsrvtests/tickets/ticket47921_test.py | 14 dirsrvtests/tickets/ticket47927_test.py | 47 - dirsrvtests/tickets/ticket47937_test.py | 14 dirsrvtests/tickets/ticket47950_test.py | 20 dirsrvtests/tickets/ticket47953_test.py | 4 dirsrvtests/tickets/ticket47963_test.py | 22 dirsrvtests/tickets/ticket47970_test.py | 10 dirsrvtests/tickets/ticket47973_test.py | 10 dirsrvtests/tickets/ticket47980_test.py | 88 +- dirsrvtests/tickets/ticket47981_test.py | 32 dirsrvtests/tickets/ticket48026_test.py | 6 dirsrvtests/tickets/ticket48109_test.py | 26 dirsrvtests/tickets/ticket48191_test.py | 9 dirsrvtests/tickets/ticket48214_test.py | 2 dirsrvtests/tickets/ticket48228_test.py | 35 dirsrvtests/tickets/ticket48233_test.py | 2 44 files changed, 684 insertions(+), 656 deletions(-) New commits: commit 278387673e99bc365cf7e74fdcad6759edef9fb5 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Wed Sep 2 16:00:13 2015 -0400 Ticket 48204 - Convert all python scripts to support python3 Description: Converted all the python scripts to support both python2 and python3
https://fedorahosted.org/389/ticket/48204
Reviewed by: nhosoi(Thanks!) (cherry picked from commit 18ae65bc31763fe0d8fbf2bc1e79ae2066e958d2) diff --git a/dirsrvtests/create_test.py b/dirsrvtests/create_test.py index ad9e5aa..0979f6e 100755 --- a/dirsrvtests/create_test.py +++ b/dirsrvtests/create_test.py @@ -82,38 +82,38 @@ if len(sys.argv) > 0: displayUsage() if args.ticket is None and args.suite is None: - print 'Missing required ticket number/suite name' + print('Missing required ticket number/suite name') displayUsage() if args.ticket and args.suite: - print 'You must choose either "-t|--ticket" or "-s|--suite", but not both.' + print('You must choose either "-t|--ticket" or "-s|--suite", but not both.') displayUsage() if int(args.masters) == 0: if int(args.hubs) > 0 or int(args.consumers) > 0: - print 'You must use "-m|--masters" if you want to have hubs and/or consumers' + print('You must use "-m|--masters" if you want to have hubs and/or consumers') displayUsage() if not args.masters.isdigit() or int(args.masters) > 10 or int(args.masters) < 0: - print 'Invalid value for "--masters", it must be a number and it can not be greater than 10' + print('Invalid value for "--masters", it must be a number and it can not be greater than 10') displayUsage() if not args.hubs.isdigit() or int(args.hubs) > 10 or int(args.hubs) < 0: - print 'Invalid value for "--hubs", it must be a number and it can not be greater than 10' + print('Invalid value for "--hubs", it must be a number and it can not be greater than 10') displayUsage() if not args.consumers.isdigit() or int(args.consumers) > 10 or int(args.consumers) < 0: - print 'Invalid value for "--consumers", it must be a number and it can not be greater than 10' + print('Invalid value for "--consumers", it must be a number and it can not be greater than 10') displayUsage() if args.inst: if not args.inst.isdigit() or int(args.inst) > 10 or int(args.inst) < 1: - print ('Invalid value for "--instances", it must be a number greater than 0 ' + + print('Invalid value for "--instances", it must be a number greater than 0 ' + 'and not greater than 10') displayUsage() if int(args.inst) > 0: if int(args.masters) > 0 or int(args.hubs) > 0 or int(args.consumers) > 0: - print 'You can not mix "--instances" with replication.' + print('You can not mix "--instances" with replication.') displayUsage() # Extract usable values @@ -141,7 +141,7 @@ if len(sys.argv) > 0: try: TEST = open(filename, "w") except IOError: - print "Can\'t open file:", filename + print("Can\'t open file:", filename) exit(1) # diff --git a/dirsrvtests/suites/acl/acl_test.py b/dirsrvtests/suites/acl/acl_test.py index c069a82..36aed33 100644 --- a/dirsrvtests/suites/acl/acl_test.py +++ b/dirsrvtests/suites/acl/acl_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -72,7 +72,7 @@ def add_attr(topology, attr_name): try: topology.standalone.modify_s(DN_SCHEMA, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add attr (%s): error (%s)' % (attr_name, e.message['desc'])) assert False @@ -102,7 +102,7 @@ def aci_with_attr_subtype(request, topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(DEFAULT_SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add ACI: error (%s)' % (e.message['desc'])) assert False @@ -112,7 +112,7 @@ def aci_with_attr_subtype(request, topology): mod = [(ldap.MOD_DELETE, 'aci', ACI_BODY)] try: topology.standalone.modify_s(DEFAULT_SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete ACI: error (%s)' % (e.message['desc'])) assert False request.addfinalizer(fin) @@ -142,7 +142,7 @@ def test_aci_attr_subtype_targetattr(topology, aci_with_attr_subtype): assert aci_with_attr_subtype in entry log.info(" The added attribute was found") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed, error: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py b/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py index 2e1ef33..c26a0a2 100644 --- a/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py +++ b/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -63,7 +63,7 @@ def test_attr_uniqueness_init(topology): ''' try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False @@ -78,7 +78,7 @@ def test_attr_uniqueness(topology): topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'uid')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to configure plugin for "uid": error ' + e.message['desc']) assert False @@ -91,7 +91,7 @@ def test_attr_uniqueness(topology): 'mail': 'user1(a)example.com', 'mailAlternateAddress': 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -116,7 +116,7 @@ def test_attr_uniqueness(topology): topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -144,7 +144,7 @@ def test_attr_uniqueness(topology): [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_attr_uniqueness: Failed to reconfigure plugin for "mail mailAlternateAddress": error ' + e.message['desc']) assert False @@ -218,7 +218,7 @@ def test_attr_uniqueness(topology): # try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to delete test entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/basic/basic_test.py b/dirsrvtests/suites/basic/basic_test.py index 0c1b83b..c6ac74b 100644 --- a/dirsrvtests/suites/basic/basic_test.py +++ b/dirsrvtests/suites/basic/basic_test.py @@ -120,7 +120,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user1', 'uid': 'user1', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -131,7 +131,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user2', 'uid': 'user2', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user3', 'uid': 'user3', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER3_DN + ': error ' + e.message['desc']) assert False @@ -152,21 +152,21 @@ def test_basic_ops(topology, import_example_ldif): try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_ADD, 'description', 'New description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add description: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'description', 'Modified description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modify description: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'description', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete description: error ' + e.message['desc']) assert False @@ -175,13 +175,13 @@ def test_basic_ops(topology, import_example_ldif): # try: topology.standalone.rename_s(USER1_DN, USER1_NEWDN, delold=1) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn user1: error ' + e.message['desc']) assert False try: topology.standalone.rename_s(USER2_DN, USER2_NEWDN, delold=0) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn user2: error ' + e.message['desc']) assert False @@ -189,7 +189,7 @@ def test_basic_ops(topology, import_example_ldif): try: topology.standalone.rename_s(USER3_DN, USER3_NEWDN, newsuperior=NEW_SUPERIOR, delold=1) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn(new superior) user3: error ' + e.message['desc']) assert False @@ -198,19 +198,19 @@ def test_basic_ops(topology, import_example_ldif): # try: topology.standalone.delete_s(USER1_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry1: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER2_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry2: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER3_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry3: ' + e.message['desc']) assert False @@ -340,7 +340,7 @@ def test_basic_acl(topology, import_example_ldif): 'cn': 'user 1', 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -352,7 +352,7 @@ def test_basic_acl(topology, import_example_ldif): 'cn': 'user 2', 'uid': 'user2', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -363,7 +363,7 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_ADD, 'aci', DENY_ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add DENY ACI: error ' + e.message['desc']) assert False @@ -372,7 +372,7 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as user1, error: ' + e.message['desc']) assert False @@ -383,14 +383,14 @@ def test_basic_acl(topology, import_example_ldif): if entries: log.fatal('test_basic_acl: User1 was incorrectly able to search the suffix!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search suffix failed(as user1): ' + e.message['desc']) assert False # Now try user2... Also check that userpassword is stripped out try: topology.standalone.simple_bind_s(USER2_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as user2, error: ' + e.message['desc']) assert False @@ -405,7 +405,7 @@ def test_basic_acl(topology, import_example_ldif): # The default anonymous access aci should have stripped out userpassword log.fatal('test_basic_acl: User2 was incorrectly able to see userpassword') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search for user1 failed(as user2): ' + e.message['desc']) assert False @@ -413,7 +413,7 @@ def test_basic_acl(topology, import_example_ldif): # Root DN for future operations) try: topology.standalone.simple_bind_s(DN_DM, PW_DM) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as ROotDN, error: ' + e.message['desc']) assert False @@ -424,7 +424,7 @@ def test_basic_acl(topology, import_example_ldif): if not entries: log.fatal('test_basic_acl: Root DN incorrectly not able to search the suffix') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search for user1 failed(as user2): ' + e.message['desc']) assert False @@ -433,19 +433,19 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_DELETE, 'aci', DENY_ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete DENY ACI: error ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete test entry1: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete test entry2: ' + e.message['desc']) assert False @@ -484,7 +484,7 @@ def test_basic_searches(topology, import_example_ldif): was returned from filter (%s): (%d) expected (%d)' % (search_filter, len(entries), search_result)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -508,14 +508,14 @@ def test_basic_referrals(topology, import_example_ldif): [(ldap.MOD_REPLACE, 'nsslapd-referral', 'ldap://localhost.localdomain:389/o%3dnetscaperoot')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set referral: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-state', 'Referral')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set backend state: error ' + e.message['desc']) assert False @@ -528,7 +528,7 @@ def test_basic_referrals(topology, import_example_ldif): topology.standalone.search_s(DEFAULT_SUFFIX, ldap.SCOPE_SUBTREE, 'objectclass=top') except ldap.REFERRAL: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Search failed: ' + e.message['desc']) assert False @@ -543,7 +543,7 @@ def test_basic_referrals(topology, import_example_ldif): try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-state', 'Backend')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set backend state: error ' + e.message['desc']) assert False @@ -551,7 +551,7 @@ def test_basic_referrals(topology, import_example_ldif): try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_DELETE, 'nsslapd-referral', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to delete referral: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/betxns/betxn_test.py b/dirsrvtests/suites/betxns/betxn_test.py index 5da6e50..7bef791 100644 --- a/dirsrvtests/suites/betxns/betxn_test.py +++ b/dirsrvtests/suites/betxns/betxn_test.py @@ -12,6 +12,7 @@ import time import ldap import logging import pytest +import six from lib389 import DirSrv, Entry, tools, tasks from lib389.tools import DirSrvTools from lib389._constants import * @@ -60,7 +61,7 @@ def test_betxn_init(topology): # First enable dynamic plugins - makes plugin testing much easier try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.error('Failed to enable dynamic plugin!' + e.message['desc']) assert False @@ -73,7 +74,7 @@ def test_betxt_7bit(topology): log.info('Running test_betxt_7bit...') USER_DN = 'uid=test_entry,' + DEFAULT_SUFFIX - eight_bit_rdn = u'uid=Fu\u00c4\u00e8' + eight_bit_rdn = six.u('uid=Fu\u00c4\u00e8') BAD_RDN = eight_bit_rdn.encode('utf-8') # This plugin should on by default, but just in case... @@ -86,7 +87,7 @@ def test_betxt_7bit(topology): 'cn': 'test 1', 'uid': 'test_entry', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER_DN + ': error ' + e.message['desc']) assert False @@ -95,7 +96,7 @@ def test_betxt_7bit(topology): topology.standalone.rename_s(USER_DN, BAD_RDN, delold=0) log.fatal('test_betxt_7bit: Modrdn operation incorrectly succeeded') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('Modrdn failed as expected: error ' + e.message['desc']) # Make sure the operation did not succeed, attempt to search for the new RDN @@ -104,7 +105,7 @@ def test_betxt_7bit(topology): if entries: log.fatal('test_betxt_7bit: Incorrectly found the entry using the invalid RDN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Error whiles earching for test entry: ' + e.message['desc']) assert False @@ -113,7 +114,7 @@ def test_betxt_7bit(topology): # try: topology.standalone.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete test entry: ' + e.message['desc']) assert False @@ -140,7 +141,7 @@ def test_betxn_attr_uniqueness(topology): 'cn': 'test 1', 'uid': 'test_entry1', 'userpassword': 'password1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_attr_uniqueness: Failed to add test user: ' + USER1_DN + ', error ' + e.message['desc']) assert False @@ -155,7 +156,7 @@ def test_betxn_attr_uniqueness(topology): 'userpassword': 'password2'}))) log.fatal('test_betxn_attr_uniqueness: The second entry was incorrectly added.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_attr_uniqueness: Failed to add test user as expected: ' + USER1_DN + ', error ' + e.message['desc']) @@ -166,7 +167,7 @@ def test_betxn_attr_uniqueness(topology): try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_attr_uniqueness: Failed to delete test entry1: ' + e.message['desc']) assert False @@ -183,7 +184,7 @@ def test_betxn_memberof(topology): topology.standalone.plugins.enable(name=PLUGIN_MEMBER_OF) try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_memberof: Failed to update config(member): error ' + e.message['desc']) assert False @@ -191,7 +192,7 @@ def test_betxn_memberof(topology): try: topology.standalone.add_s(Entry((ENTRY1_DN, {'objectclass': "top groupofnames".split(), 'cn': 'group1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_memberof: Failed to add group1:' + ENTRY1_DN + ', error ' + e.message['desc']) assert False @@ -199,7 +200,7 @@ def test_betxn_memberof(topology): try: topology.standalone.add_s(Entry((ENTRY2_DN, {'objectclass': "top groupofnames".split(), 'cn': 'group1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_memberof: Failed to add group2:' + ENTRY2_DN + ', error ' + e.message['desc']) assert False @@ -213,7 +214,7 @@ def test_betxn_memberof(topology): topology.standalone.modify_s(ENTRY1_DN, [(ldap.MOD_REPLACE, 'member', ENTRY2_DN)]) log.fatal('test_betxn_memberof: Group2 was incorrectly allowed to be added to group1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_betxn_memberof: Group2 was correctly rejected (mod replace): error ' + e.message['desc']) # @@ -225,7 +226,7 @@ def test_betxn_memberof(topology): topology.standalone.modify_s(ENTRY1_DN, [(ldap.MOD_ADD, 'member', ENTRY2_DN)]) log.fatal('test_betxn_memberof: Group2 was incorrectly allowed to be added to group1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_betxn_memberof: Group2 was correctly rejected (mod add): error ' + e.message['desc']) # diff --git a/dirsrvtests/suites/config/config_test.py b/dirsrvtests/suites/config/config_test.py index 43070ce..d3631e3 100644 --- a/dirsrvtests/suites/config/config_test.py +++ b/dirsrvtests/suites/config/config_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -79,27 +79,28 @@ def test_config_listen_backport_size(topology): if not default_val: log.fatal('test_config_listen_backport_size: Failed to get nsslapd-listen-backlog-size from config') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to search config, error: ' + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', '256')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to modify config, error: ' + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', '-1')]) - except ldap.LDAPError, e: - log.fatal('test_config_listen_backport_size: Failed to modify config(negative value), error: ' + e.message('desc')) + except ldap.LDAPError as e: + log.fatal('test_config_listen_backport_size: Failed to modify config(negative value), error: ' + + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', 'ZZ')]) log.fatal('test_config_listen_backport_size: Invalid value was successfully added') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: pass # @@ -107,7 +108,7 @@ def test_config_listen_backport_size(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', default_val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to reset config, error: ' + e.message('desc')) assert False @@ -136,7 +137,7 @@ def test_config_deadlock_policy(topology): log.fatal('test_config_deadlock_policy: The wrong derfualt value was present: (%s) but expected (%s)' % (val, default_val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to search config, error: ' + e.message('desc')) assert False @@ -144,7 +145,7 @@ def test_config_deadlock_policy(topology): for val in ('0', '5', '9'): try: topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to modify config: nsslapd-db-deadlock-policy to (%s), error: %s' % (val, e.message('desc'))) assert False @@ -155,14 +156,14 @@ def test_config_deadlock_policy(topology): topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', val)]) log.fatal('test_config_deadlock_policy: Able to add invalid value to nsslapd-db-deadlock-policy(%s)' % (val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: pass # # Cleanup - undo what we've done # try: topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', default_val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to reset nsslapd-db-deadlock-policy to the default value(%s), error: %s' % (default_val, e.message('desc'))) diff --git a/dirsrvtests/suites/dynamic-plugins/plugin_tests.py b/dirsrvtests/suites/dynamic-plugins/plugin_tests.py index 1b5f63d..30dfa88 100644 --- a/dirsrvtests/suites/dynamic-plugins/plugin_tests.py +++ b/dirsrvtests/suites/dynamic-plugins/plugin_tests.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -64,7 +64,7 @@ def test_dependency(inst, plugin): inst.modify_s('cn=' + PLUGIN_ACCT_USABILITY + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'nsslapd-plugin-depends-on-named', plugin)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dependency: Failed to modify ' + PLUGIN_ACCT_USABILITY + ': error ' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_dependency(inst, plugin): try: inst.modify_s('cn=' + PLUGIN_ACCT_USABILITY + ',cn=plugins,cn=config', [(ldap.MOD_DELETE, 'nsslapd-plugin-depends-on-named', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dependency: Failed to reset ' + plugin + ': error ' + e.message['desc']) assert False @@ -107,7 +107,7 @@ def wait_for_task(conn, task_dn): # task is done finished = True break - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('wait_for_task: Search failed: ' + e.message['desc']) assert False @@ -152,10 +152,10 @@ def test_acctpolicy(inst, args=None): inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'alwaysrecordlogin', 'yes'), (ldap.MOD_REPLACE, 'stateattrname', 'lastLoginTime')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to modify config entry: error ' + e.message['desc']) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to add config entry: error ' + e.message['desc']) assert False @@ -171,14 +171,14 @@ def test_acctpolicy(inst, args=None): 'cn': 'user 1', 'uid': 'user1', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False # bind as user try: inst.simple_bind_s(USER1_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as user1: ' + e.message['desc']) assert False @@ -186,7 +186,7 @@ def test_acctpolicy(inst, args=None): time.sleep(1) try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -196,7 +196,7 @@ def test_acctpolicy(inst, args=None): if not entries: log.fatal('test_acctpolicy: Search failed to find an entry with lastLoginTime.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Search failed: ' + e.message['desc']) assert False @@ -207,7 +207,7 @@ def test_acctpolicy(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'stateattrname', 'testLastLoginTime')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -219,7 +219,7 @@ def test_acctpolicy(inst, args=None): # login as user try: inst.simple_bind_s(USER1_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind(2nd) as user1: ' + e.message['desc']) assert False @@ -227,7 +227,7 @@ def test_acctpolicy(inst, args=None): # Bind as Root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -237,7 +237,7 @@ def test_acctpolicy(inst, args=None): if not entries: log.fatal('test_acctpolicy: Search failed to find an entry with testLastLoginTime.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Search failed: ' + e.message['desc']) assert False @@ -253,7 +253,7 @@ def test_acctpolicy(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to delete test entry: ' + e.message['desc']) assert False @@ -289,7 +289,7 @@ def test_attruniq(inst, args=None): inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'uid')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to configure plugin for "uid": error ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_attruniq(inst, args=None): 'mail': 'user1(a)example.com', 'mailAlternateAddress' : 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -333,7 +333,7 @@ def test_attruniq(inst, args=None): inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -360,11 +360,11 @@ def test_attruniq(inst, args=None): try: inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', - [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), + [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_attruniq: Failed to reconfigure plugin for "mail mailAlternateAddress": error ' + e.message['desc']) assert False @@ -448,7 +448,7 @@ def test_attruniq(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to delete test entry: ' + e.message['desc']) assert False @@ -487,7 +487,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'cn': 'group' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add group: error ' + e.message['desc']) assert False @@ -497,7 +497,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'ou': 'branch1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add branch1: error ' + e.message['desc']) assert False @@ -507,7 +507,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'ou': 'branch2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add branch2: error ' + e.message['desc']) assert False @@ -521,7 +521,7 @@ def test_automember(inst, args=None): 'autoMemberDefaultGroup': 'cn=group,' + DEFAULT_SUFFIX, 'autoMemberGroupingAttr': 'member:dn' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add config entry: error ' + e.message['desc']) assert False @@ -535,7 +535,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add user: error ' + e.message['desc']) assert False @@ -546,7 +546,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: Search failed to find member user1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -559,7 +559,7 @@ def test_automember(inst, args=None): [(ldap.MOD_REPLACE, 'autoMemberGroupingAttr', 'uniquemember:dn'), (ldap.MOD_REPLACE, 'autoMemberScope', 'ou=branch2,' + DEFAULT_SUFFIX)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -573,7 +573,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to user to branch2: error ' + e.message['desc']) assert False @@ -584,7 +584,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: Search failed to find uniquemember user2') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -601,7 +601,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to user3 to branch2: error ' + e.message['desc']) assert False @@ -612,7 +612,7 @@ def test_automember(inst, args=None): if entries: log.fatal('test_automember: user3 was incorrectly added to the group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -626,7 +626,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': 'ou=branch2,' + DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add task: error ' + e.message['desc']) assert False @@ -639,7 +639,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: user3 was not added to the group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -655,43 +655,43 @@ def test_automember(inst, args=None): try: inst.delete_s(BUSER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(BUSER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry2: ' + e.message['desc']) assert False try: inst.delete_s(BUSER3_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry3: ' + e.message['desc']) assert False try: inst.delete_s(BRANCH1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete branch1: ' + e.message['desc']) assert False try: inst.delete_s(BRANCH2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test branch2: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test group: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete plugin config entry: ' + e.message['desc']) assert False @@ -739,10 +739,10 @@ def test_dna(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaNextValue', '1'), (ldap.MOD_REPLACE, 'dnaMagicRegen', '-1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the DNA plugin: error ' + e.message['desc']) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to add config entry: error ' + e.message['desc']) assert False @@ -755,7 +755,7 @@ def test_dna(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to user1: error ' + e.message['desc']) assert False @@ -765,14 +765,14 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated - (looking for uidNumber: 1)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False # Test the magic regen value try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', '-1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc']) assert False @@ -782,7 +782,7 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated (looking for uidNumber: 2)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False @@ -792,7 +792,7 @@ def test_dna(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaMagicRegen', '-2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value to -2: error ' + e.message['desc']) assert False @@ -803,7 +803,7 @@ def test_dna(inst, args=None): # Test the magic regen value try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', '-2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc']) assert False @@ -813,7 +813,7 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated (looking for uidNumber: 3)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False @@ -829,7 +829,7 @@ def test_dna(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to delete test entry1: ' + e.message['desc']) assert False @@ -871,7 +871,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to user1: error ' + e.message['desc']) assert False @@ -880,7 +880,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to user1: error ' + e.message['desc']) assert False @@ -892,7 +892,7 @@ def test_linkedattrs(inst, args=None): 'linkType': 'directReport', 'managedType': 'manager' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add config entry: error ' + e.message['desc']) assert False @@ -903,7 +903,7 @@ def test_linkedattrs(inst, args=None): # Set "directReport" should add "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'directReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "directReport" to user1: error ' + e.message['desc']) assert False @@ -913,14 +913,14 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: user2 missing "manager" attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False # Remove "directReport" should remove "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'directReport', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete directReport: error ' + e.message['desc']) assert False @@ -930,7 +930,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 "manager" attribute not removed') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -940,7 +940,7 @@ def test_linkedattrs(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'linkType', 'indirectReport')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_linkedattrs: Failed to set linkTypee: error ' + e.message['desc']) assert False @@ -951,7 +951,7 @@ def test_linkedattrs(inst, args=None): # Make sure the old linkType(directManager) is not working try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'directReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "directReport" to user1: error ' + e.message['desc']) assert False @@ -961,14 +961,14 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 had "manager" added unexpectedly') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user2 failed: ' + e.message['desc']) assert False # Now, set the new linkType "indirectReport", which should add "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'indirectReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "indirectReport" to user1: error ' + e.message['desc']) assert False @@ -978,14 +978,14 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: user2 missing "manager"') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user2 failed: ' + e.message['desc']) assert False # Remove "indirectReport" should remove "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'indirectReport', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete directReport: error ' + e.message['desc']) assert False @@ -995,7 +995,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 "manager" attribute not removed') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1008,7 +1008,7 @@ def test_linkedattrs(inst, args=None): try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'indirectReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "indirectReport" to user1: error ' + e.message['desc']) assert False @@ -1018,7 +1018,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 incorrectly has a "manager" attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1032,7 +1032,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add task: error ' + e.message['desc']) assert False @@ -1044,7 +1044,7 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: task failed: user2 missing "manager" attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1060,19 +1060,19 @@ def test_linkedattrs(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete test entry2: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete plugin config entry: ' + e.message['desc']) assert False @@ -1108,7 +1108,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(member): error ' + e.message['desc']) assert False @@ -1122,7 +1122,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add user1: error ' + e.message['desc']) assert False @@ -1132,7 +1132,7 @@ def test_memberof(inst, args=None): 'cn': 'group', 'member': USER1_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add group: error ' + e.message['desc']) assert False @@ -1142,7 +1142,7 @@ def test_memberof(inst, args=None): 'memberofgroupattr': 'member', 'memberofattr': 'memberof' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to shared config entry: error ' + e.message['desc']) assert False @@ -1152,14 +1152,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "member" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1169,7 +1169,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1179,7 +1179,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False @@ -1189,7 +1189,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1199,14 +1199,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'uniquemember', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1216,7 +1216,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1227,20 +1227,20 @@ def test_memberof(inst, args=None): # The shared config entry uses "member" - the above test uses "uniquemember" try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, CONFIG_AREA, SHARED_CONFIG_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to set plugin area: error ' + e.message['desc']) assert False # Delete the test entries then readd them to start with a clean slate try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test group: ' + e.message['desc']) assert False @@ -1249,7 +1249,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add user1: error ' + e.message['desc']) assert False @@ -1259,7 +1259,7 @@ def test_memberof(inst, args=None): 'cn': 'group', 'member': USER1_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add group: error ' + e.message['desc']) assert False @@ -1270,14 +1270,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "member" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1287,7 +1287,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1297,14 +1297,14 @@ def test_memberof(inst, args=None): try: inst.modify_s(SHARED_CONFIG_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to set shared plugin entry(uniquemember): error ' + e.message['desc']) assert False try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1314,14 +1314,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'uniquemember', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1331,7 +1331,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1342,20 +1342,20 @@ def test_memberof(inst, args=None): # First change the plugin to use member before we move the shared config that uses uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Remove shared config from plugin try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, CONFIG_AREA, None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'member', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1365,14 +1365,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1382,7 +1382,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1395,14 +1395,14 @@ def test_memberof(inst, args=None): # First change the plugin to use uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Add uniquemember, should not update USER1 try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1412,7 +1412,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrect has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1425,7 +1425,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add task: error ' + e.message['desc']) assert False @@ -1437,7 +1437,7 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1453,19 +1453,19 @@ def test_memberof(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test group: ' + e.message['desc']) assert False try: inst.delete_s(SHARED_CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete shared config entry: ' + e.message['desc']) assert False @@ -1512,7 +1512,7 @@ def test_mep(inst, args=None): 'ou': 'people'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add people org unit: error ' + e.message['desc']) assert False @@ -1522,7 +1522,7 @@ def test_mep(inst, args=None): 'ou': 'people'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add people org unit: error ' + e.message['desc']) assert False @@ -1535,7 +1535,7 @@ def test_mep(inst, args=None): 'mepStaticAttr': 'objectclass: posixGroup|objectclass: extensibleObject'.split('|'), 'mepMappedAttr': 'cn: $cn|uid: $cn|gidNumber: $uidNumber'.split('|') }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add template entry: error ' + e.message['desc']) assert False @@ -1549,7 +1549,7 @@ def test_mep(inst, args=None): 'managedBase': GROUP_OU, 'managedTemplate': TEMPLATE_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add config entry: error ' + e.message['desc']) assert False @@ -1567,14 +1567,14 @@ def test_mep(inst, args=None): 'gidNumber': '1', 'homeDirectory': '/home/user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to user1: error ' + e.message['desc']) assert False # Check if a managed group entry was created try: inst.search_s(MEP_USER_DN, ldap.SCOPE_BASE, '(objectclass=top)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Unable to find MEP entry: ' + e.message['desc']) assert False @@ -1591,14 +1591,14 @@ def test_mep(inst, args=None): 'mepStaticAttr': 'objectclass: posixGroup|objectclass: extensibleObject'.split('|'), 'mepMappedAttr': 'cn: $uid|uid: $cn|gidNumber: $gidNumber'.split('|') }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add template entry2: error ' + e.message['desc']) assert False # Set the new template dn try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'managedTemplate', TEMPLATE_DN2)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to set mep plugin config: error ' + e.message['desc']) assert False @@ -1616,14 +1616,14 @@ def test_mep(inst, args=None): 'gidNumber': '1', 'homeDirectory': '/home/user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to user2: error ' + e.message['desc']) assert False # Check if a managed group entry was created try: inst.search_s(MEP_USER_DN2, ldap.SCOPE_BASE, '(objectclass=top)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Unable to find MEP entry2: ' + e.message['desc']) assert False @@ -1639,19 +1639,19 @@ def test_mep(inst, args=None): try: inst.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete test user1: ' + e.message['desc']) assert False try: inst.delete_s(USER_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete test user 2: ' + e.message['desc']) assert False try: inst.delete_s(TEMPLATE_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete template1: ' + e.message['desc']) assert False @@ -1659,13 +1659,13 @@ def test_mep(inst, args=None): try: inst.delete_s(TEMPLATE_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete template2: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete config: ' + e.message['desc']) assert False @@ -1727,7 +1727,7 @@ def test_passthru(inst, args=None): 'dc': 'pass2'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to create suffix entry: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1739,7 +1739,7 @@ def test_passthru(inst, args=None): 'uid': 'admin', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to admin1: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1751,7 +1751,7 @@ def test_passthru(inst, args=None): 'uid': 'admin2', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to admin2 : error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1763,7 +1763,7 @@ def test_passthru(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginenabled', 'on'), (ldap.MOD_REPLACE, 'nsslapd-pluginarg0', 'ldap://127.0.0.1:33333/dc=pass,dc=thru')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to set mep plugin config: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1775,7 +1775,7 @@ def test_passthru(inst, args=None): # login as user try: inst.simple_bind_s(PASSTHRU_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1787,14 +1787,14 @@ def test_passthru(inst, args=None): # login as root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginarg0', 'ldap://127.0.0.1:33333/dc=pass2,dc=thru')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to set mep plugin config: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1806,7 +1806,7 @@ def test_passthru(inst, args=None): # login as user try: inst.simple_bind_s(PASSTHRU_DN2, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1814,7 +1814,7 @@ def test_passthru(inst, args=None): # login as root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1864,7 +1864,7 @@ def test_referint(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -1878,7 +1878,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False @@ -1887,7 +1887,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user2: error ' + e.message['desc']) assert False @@ -1898,7 +1898,7 @@ def test_referint(inst, args=None): 'member': USER1_DN, 'uniquemember': USER2_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add group: error ' + e.message['desc']) assert False @@ -1907,7 +1907,7 @@ def test_referint(inst, args=None): try: entries = inst.search_s(PLUGIN_DN, ldap.SCOPE_BASE, '(objectclass=top)') REFERINT_LOGFILE = entries[0].getValue('referint-logfile') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search plugin entry: ' + e.message['desc']) assert False @@ -1920,14 +1920,14 @@ def test_referint(inst, args=None): 'referint-logfile': REFERINT_LOGFILE, 'referint-logchanges': '0' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to shared config entry: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -1937,7 +1937,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -1947,7 +1947,7 @@ def test_referint(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -1958,7 +1958,7 @@ def test_referint(inst, args=None): # Delete a user try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -1968,7 +1968,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user2 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -1979,14 +1979,14 @@ def test_referint(inst, args=None): # The shared config entry uses "member" - the above test used "uniquemember" try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, CONFIG_AREA, SHARED_CONFIG_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to set plugin area: error ' + e.message['desc']) assert False # Delete the group, and readd everything try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete group: ' + e.message['desc']) assert False @@ -1995,7 +1995,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False @@ -2004,7 +2004,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user2: error ' + e.message['desc']) assert False @@ -2015,14 +2015,14 @@ def test_referint(inst, args=None): 'member': USER1_DN, 'uniquemember': USER2_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add group: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2032,7 +2032,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2042,7 +2042,7 @@ def test_referint(inst, args=None): try: inst.modify_s(SHARED_CONFIG_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to set shared plugin entry(uniquemember): error ' + e.message['desc']) assert False @@ -2050,7 +2050,7 @@ def test_referint(inst, args=None): # Delete a user try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2060,7 +2060,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user2 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2071,14 +2071,14 @@ def test_referint(inst, args=None): # First change the plugin to use member before we move the shared config that uses uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Remove shared config from plugin try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, CONFIG_AREA, None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -2088,21 +2088,21 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False # Add user to group try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'member', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add uniquemember: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2112,7 +2112,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2128,13 +2128,13 @@ def test_referint(inst, args=None): try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete group: ' + e.message['desc']) assert False try: inst.delete_s(SHARED_CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete shared config entry: ' + e.message['desc']) assert False @@ -2169,7 +2169,7 @@ def test_retrocl(inst, args=None): # Gather the current change count (it's not 1 once we start the stabilty tests) try: entry = inst.search_s(RETROCL_SUFFIX, ldap.SCOPE_SUBTREE, '(changenumber=*)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to get the count: error ' + e.message['desc']) assert False @@ -2185,7 +2185,7 @@ def test_retrocl(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to add user1: error ' + e.message['desc']) assert False @@ -2195,7 +2195,7 @@ def test_retrocl(inst, args=None): if not entry or len(entry) == entry_count: log.fatal('test_retrocl: changelog not updated') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Unable to search group: ' + e.message['desc']) assert False @@ -2213,7 +2213,7 @@ def test_retrocl(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to delete user1: ' + e.message['desc']) assert False @@ -2224,7 +2224,7 @@ def test_retrocl(inst, args=None): log.fatal('test_retrocl: changelog incorrectly updated - change count: ' + str(len(entry)) + ' - expected 1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Unable to search retro changelog: ' + e.message['desc']) assert False @@ -2278,7 +2278,7 @@ def test_rootdn(inst, args=None): 'uid': 'user1', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add user1: error ' + e.message['desc']) assert False @@ -2287,14 +2287,14 @@ def test_rootdn(inst, args=None): '"all access";allow (all)(userdn="ldap:///anyone");)') try: inst.modify_s(DN_CONFIG, [(ldap.MOD_ADD, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add aci to config: error ' + e.message['desc']) assert False # Set allowed IP to an unknown host - blocks root dn try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '10.10.10.10')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -2306,7 +2306,7 @@ def test_rootdn(inst, args=None): failed = False try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: failed = True if not failed: @@ -2320,7 +2320,7 @@ def test_rootdn(inst, args=None): # Bind as the user who can make updates to the config try: inst.simple_bind_s(USER1_DN, 'password') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: failed to bind as user1') assert False @@ -2342,7 +2342,7 @@ def test_rootdn(inst, args=None): # Remove the restriction try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -2354,7 +2354,7 @@ def test_rootdn(inst, args=None): failed = False try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: failed = True if failed: @@ -2373,13 +2373,13 @@ def test_rootdn(inst, args=None): try: inst.modify_s(DN_CONFIG, [(ldap.MOD_DELETE, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add aci to config: error ' + e.message['desc']) assert False try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to delete user1: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/dynamic-plugins/stress_tests.py b/dirsrvtests/suites/dynamic-plugins/stress_tests.py index 72c1f3e..920d3f6 100644 --- a/dirsrvtests/suites/dynamic-plugins/stress_tests.py +++ b/dirsrvtests/suites/dynamic-plugins/stress_tests.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -48,7 +48,7 @@ def configureRI(inst): PLUGIN_DN = 'cn=' + PLUGIN_REFER_INTEGRITY + ',cn=plugins,cn=config' try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('configureRI: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -59,7 +59,7 @@ def configureMO(inst): PLUGIN_DN = 'cn=' + PLUGIN_MEMBER_OF + ',cn=plugins,cn=config' try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('configureMO: Failed to update config(uniquemember): error ' + e.message['desc']) assert False @@ -67,7 +67,7 @@ def configureMO(inst): def cleanup(conn): try: conn.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('cleanup: failed to delete group (' + GROUP_DN + ') error: ' + e.message['desc']) assert False @@ -87,7 +87,7 @@ class DelUsers(threading.Thread): USER_DN = 'uid=' + self.rdnval + str(idx) + ',' + DEFAULT_SUFFIX try: conn.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('DeleteUsers: failed to delete (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -117,7 +117,7 @@ class AddUsers(threading.Thread): 'uid': 'user' + str(idx)}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: failed to add group (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -128,7 +128,7 @@ class AddUsers(threading.Thread): try: conn.add_s(Entry((USER_DN, {'objectclass': 'top extensibleObject'.split(), 'uid': 'user' + str(idx)}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: failed to add (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -136,7 +136,7 @@ class AddUsers(threading.Thread): # Add the user to the group try: conn.modify_s(GROUP_DN, [(ldap.MOD_ADD, 'uniquemember', USER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: Failed to add user' + USER_DN + ' to group: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py b/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py index f2cad88..c05c402 100644 --- a/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py +++ b/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -115,14 +115,14 @@ def test_dynamic_plugins(topology): # First enable dynamic plugins try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False # Test that critical plugins can be updated even though the change might not be applied try: topology.standalone.modify_s(DN_LDBM, [(ldap.MOD_REPLACE, 'description', 'test')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to apply change to critical plugin' + e.message['desc']) assert False @@ -380,7 +380,7 @@ def test_dynamic_plugins(topology): log.error('Failed to find maxcsn on master') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search masterfor db tombstone: ' + e.message['desc']) repl_fail(replica_inst) @@ -404,7 +404,7 @@ def test_dynamic_plugins(topology): if replica_maxcsn == 0: log.error('Failed to find maxcsn on consumer') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for db tombstone on consumer: ' + e.message['desc']) repl_fail(replica_inst) @@ -433,7 +433,7 @@ def test_dynamic_plugins(topology): if len(entries) > 0: log.error('Master database has incorrect data set!\n') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search db on master: ' + e.message['desc']) repl_fail(replica_inst) @@ -445,7 +445,7 @@ def test_dynamic_plugins(topology): if len(entries) > 0: log.error('Consumer database in not consistent with master database') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search db on consumer: ' + e.message['desc']) repl_fail(replica_inst) diff --git a/dirsrvtests/suites/filter/filter_test.py b/dirsrvtests/suites/filter/filter_test.py index 5e7fa34..d212f6a 100644 --- a/dirsrvtests/suites/filter/filter_test.py +++ b/dirsrvtests/suites/filter/filter_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -79,7 +79,7 @@ def test_filter_escaped(topology): 'cn': 'test * me', 'uid': 'test_entry', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -90,7 +90,7 @@ def test_filter_escaped(topology): 'cn': 'test me', 'uid': 'test_entry2', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to add test user ' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_filter_escaped(topology): if not entry or len(entry) > 1: log.fatal('test_filter_escaped: Entry was not found using "cn=*\**"') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to search for user(%s), error: %s' % (USER1_DN, e.message('desc'))) assert False @@ -121,7 +121,7 @@ def test_filter_search_original_attrs(topology): if entry[0].hasAttr('objectclass-EXTRA'): log.fatal('test_filter_search_original_attrs: Entry does not have the original attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_search_original_attrs: Failed to search suffix(%s), error: %s' % (DEFAULT_SUFFIX, e.message('desc'))) assert False diff --git a/dirsrvtests/suites/memory_leaks/range_search_test.py b/dirsrvtests/suites/memory_leaks/range_search_test.py index 7d9d14f..21369b9 100644 --- a/dirsrvtests/suites/memory_leaks/range_search_test.py +++ b/dirsrvtests/suites/memory_leaks/range_search_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -100,7 +100,7 @@ def test_range_search(topology): try: topology.standalone.add_s(Entry((USER_DN, {'objectclass': "top extensibleObject".split(), 'uid': 'user' + idx}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_range_search: Failed to add test user ' + USER_DN + ': error ' + e.message['desc']) success = False time.sleep(1) @@ -110,7 +110,7 @@ def test_range_search(topology): try: topology.standalone.search_s(RETROCL_SUFFIX, ldap.SCOPE_SUBTREE, '(&(changenumber>=74)(changenumber<=84))') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_range_search: Failed to search retro changelog(%s), error: %s' % (RETROCL_SUFFIX, e.message('desc'))) test_range_search_final(topology) # With valgrind we always need to cleanup diff --git a/dirsrvtests/suites/password/password_test.py b/dirsrvtests/suites/password/password_test.py index f21d051..3465c2c 100644 --- a/dirsrvtests/suites/password/password_test.py +++ b/dirsrvtests/suites/password/password_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -82,7 +82,7 @@ def test_password_delete_specific_password(topology): 'cn': 'user 1', 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to add test user ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -92,7 +92,7 @@ def test_password_delete_specific_password(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_DELETE, 'userpassword', PASSWORD)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to delete userpassword: error ' + e.message['desc']) assert False @@ -105,7 +105,7 @@ def test_password_delete_specific_password(topology): if entry[0].hasAttr('userpassword'): log.fatal('test_password_delete_specific_password: Entry incorrectly still have the userpassword attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to search for user(%s), error: %s' % (USER_DN, e.message('desc'))) assert False @@ -115,7 +115,7 @@ def test_password_delete_specific_password(topology): # try: topology.standalone.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to delete user(%s), error: %s' % (USER_DN, e.message('desc'))) assert False diff --git a/dirsrvtests/suites/password/pwdAdmin_test.py b/dirsrvtests/suites/password/pwdAdmin_test.py index a1edc64..2c38756 100644 --- a/dirsrvtests/suites/password/pwdAdmin_test.py +++ b/dirsrvtests/suites/password/pwdAdmin_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -80,7 +80,7 @@ def test_pwdAdmin_init(topology): topology.standalone.add_s(Entry((ADMIN_DN, {'objectclass': "top extensibleObject".split(), 'cn': ADMIN_NAME, 'userpassword': ADMIN_PWD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add test user' + ADMIN_DN + ': error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_pwdAdmin_init(topology): topology.standalone.add_s(Entry((ADMIN2_DN, {'objectclass': "top extensibleObject".split(), 'cn': ADMIN2_NAME, 'userpassword': ADMIN_PWD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add test user ' + ADMIN2_DN + ': error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_pwdAdmin_init(topology): 'cn': 'password admin group', 'uniquemember': ADMIN_DN, 'uniquemember': ADMIN2_DN}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add group' + ADMIN_GROUP_DN + ': error ' + e.message['desc']) assert False @@ -113,7 +113,7 @@ def test_pwdAdmin_init(topology): (ldap.MOD_REPLACE, 'passwordExp', 'on'), (ldap.MOD_REPLACE, 'passwordMinDigits', '1'), (ldap.MOD_REPLACE, 'passwordMinSpecials', '1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed configure password policy: ' + e.message['desc']) assert False @@ -131,7 +131,7 @@ def test_pwdAdmin_init(topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add aci for password admin: ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_pwdAdmin_init(topology): log.info('test_pwdAdmin_init: Bind as the Password Administator (before activating)...') try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -166,7 +166,7 @@ def test_pwdAdmin_init(topology): (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True log.info('test_pwdAdmin_init: Add failed as expected: password (%s) result (%s)' @@ -209,7 +209,7 @@ def test_pwdAdmin(topology): # Bind as Root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -217,7 +217,7 @@ def test_pwdAdmin(topology): # Set the password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -225,7 +225,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -239,7 +239,7 @@ def test_pwdAdmin(topology): (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add entry with password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -249,7 +249,7 @@ def test_pwdAdmin(topology): # Delete entry for the next pass try: topology.standalone.delete_s(ENTRY_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to delete entry: %s' % (e.message['desc'])) assert False @@ -260,7 +260,7 @@ def test_pwdAdmin(topology): entry.setValues('userpassword', ADMIN_PWD) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add entry with valid password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -274,7 +274,7 @@ def test_pwdAdmin(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -282,7 +282,7 @@ def test_pwdAdmin(topology): # Remove password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_DELETE, 'passwordAdminDN', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to remove password admin from config: ' + e.message['desc']) assert False @@ -290,7 +290,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin (who is no longer an admin) try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -303,7 +303,7 @@ def test_pwdAdmin(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True log.info('test_pwdAdmin: Password update failed as expected: password (%s) result (%s)' @@ -322,14 +322,14 @@ def test_pwdAdmin(topology): # Bind as root DN to make the update try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config - set the password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -337,7 +337,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -348,7 +348,7 @@ def test_pwdAdmin(topology): for passwd in INVALID_PWDS: try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -362,14 +362,14 @@ def test_pwdAdmin(topology): # Bind as root DN to make the update try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config - set the password admin group try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_GROUP_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -377,7 +377,7 @@ def test_pwdAdmin(topology): # Bind as admin2 try: topology.standalone.simple_bind_s(ADMIN2_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin2: ' + e.message['desc']) assert False @@ -386,7 +386,7 @@ def test_pwdAdmin(topology): for passwd in INVALID_PWDS: try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -395,7 +395,7 @@ def test_pwdAdmin(topology): # Cleanup - bind as Root DN for the other tests try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -412,7 +412,7 @@ def test_pwdAdmin_config_validation(topology): topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_ADD, 'passwordAdminDN', ENTRY_DN)]) log.fatal('test_pwdAdmin_config_validation: Incorrectly was able to add two config attributes') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_pwdAdmin_config_validation: Failed as expected: ' + e.message['desc']) @@ -421,7 +421,7 @@ def test_pwdAdmin_config_validation(topology): topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_ADD, 'passwordAdminDN', 'ZZZZZ')]) log.fatal('test_pwdAdmin_config_validation: Incorrectly was able to add invalid DN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_pwdAdmin_config_validation: Failed as expected: ' + e.message['desc']) diff --git a/dirsrvtests/suites/replication/cleanallruv_test.py b/dirsrvtests/suites/replication/cleanallruv_test.py index 18576ea..373269d 100644 --- a/dirsrvtests/suites/replication/cleanallruv_test.py +++ b/dirsrvtests/suites/replication/cleanallruv_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -56,7 +56,7 @@ class AddUsers(threading.Thread): except ldap.UNWILLING_TO_PERFORM: # One of the masters was probably put into read only mode - just break out break - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('AddUsers: failed to add (' + USER_DN + ') error: ' + e.message['desc']) assert False idx += 1 @@ -544,19 +544,19 @@ def test_cleanallruv_clean(topology): log.info('test_cleanallruv_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -566,7 +566,7 @@ def test_cleanallruv_clean(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -592,7 +592,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Unable to search master 1 for db tombstone: ' + e.message['desc']) # Check master 2 @@ -609,7 +609,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search master 2 for db tombstone: ' + e.message['desc']) # Check master 3 @@ -626,7 +626,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Unable to search master 3 for db tombstone: ' + e.message['desc']) # Sleep a bit and give it chance to clean up... @@ -668,19 +668,19 @@ def test_cleanallruv_clean_restart(topology): log.info('test_cleanallruv_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -693,7 +693,7 @@ def test_cleanallruv_clean_restart(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -737,7 +737,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -755,7 +755,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -773,7 +773,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -827,19 +827,19 @@ def test_cleanallruv_clean_force(topology): log.info('test_cleanallruv_clean_force: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -850,7 +850,7 @@ def test_cleanallruv_clean_force(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', force=True, args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean_force: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -876,7 +876,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('test_cleanallruv_clean_force: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -894,7 +894,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -912,7 +912,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('test_cleanallruv_clean_force: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -961,19 +961,19 @@ def test_cleanallruv_abort(topology): log.info('test_cleanallruv_abort: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -987,7 +987,7 @@ def test_cleanallruv_abort(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1000,7 +1000,7 @@ def test_cleanallruv_abort(topology): try: topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running abortCleanAllRuv task: ' + e.message('desc')) assert False @@ -1033,7 +1033,7 @@ def test_cleanallruv_abort(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1064,19 +1064,19 @@ def test_cleanallruv_abort_restart(topology): log.info('test_cleanallruv_abort_restart: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1090,7 +1090,7 @@ def test_cleanallruv_abort_restart(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1103,7 +1103,7 @@ def test_cleanallruv_abort_restart(topology): try: topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', certify=True, args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running test_cleanallruv_abort_restart task: ' + e.message('desc')) assert False @@ -1149,7 +1149,7 @@ def test_cleanallruv_abort_restart(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1188,19 +1188,19 @@ def test_cleanallruv_abort_certify(topology): log.info('test_cleanallruv_abort_certify: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1214,7 +1214,7 @@ def test_cleanallruv_abort_certify(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1224,7 +1224,7 @@ def test_cleanallruv_abort_certify(topology): try: (abort_task_dn, rc) = topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', certify=True, args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running abortCleanAllRuv task: ' + e.message('desc')) assert False @@ -1286,7 +1286,7 @@ def test_cleanallruv_abort_certify(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1324,7 +1324,7 @@ def test_cleanallruv_stress_clean(topology): log.info('test_cleanallruv_stress_clean: put master 4 into read-only mode...') try: topology.master4.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-readonly', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to put master 4 into read-only mode: error ' + e.message['desc']) assert False @@ -1345,19 +1345,19 @@ def test_cleanallruv_stress_clean(topology): log.info('test_cleanallruv_stress_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1367,7 +1367,7 @@ def test_cleanallruv_stress_clean(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_stress_clean: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1400,7 +1400,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -1418,7 +1418,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -1436,7 +1436,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -1457,7 +1457,7 @@ def test_cleanallruv_stress_clean(topology): # Turn off readonly mode try: topology.master4.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-readonly', 'off')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to put master 4 into read-only mode: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py b/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py index e0e7ec6..2e70656 100644 --- a/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py +++ b/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -84,7 +84,7 @@ def test_rootdn_init(topology): ';acl "all access";allow (all)(userdn="ldap:///anyone");)') try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_ADD, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to add aci to config: error ' + e.message['desc']) assert False @@ -96,7 +96,7 @@ def test_rootdn_init(topology): topology.standalone.add_s(Entry((USER1_DN, {'objectclass': "top extensibleObject".split(), 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_rootdn_init(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to set dynamic plugins: error ' + e.message['desc']) assert False @@ -137,7 +137,7 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-open-time', open_time), (ldap.MOD_ADD, 'rootdn-close-time', close_time)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to set (blocking) open/close times: error ' + e.message['desc']) assert False @@ -148,7 +148,7 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -160,21 +160,21 @@ def test_rootdn_access_specific_time(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: test_rootdn: failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-open-time', '0000'), (ldap.MOD_REPLACE, 'rootdn-close-time', '2359')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to set (open) open/close times: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -185,14 +185,14 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-open-time', None), (ldap.MOD_DELETE, 'rootdn-close-time', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to delete open and close time: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -223,7 +223,7 @@ def test_rootdn_access_day_of_week(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-days-allowed', deny_days)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set the deny days: error ' + e.message['desc']) assert False @@ -234,7 +234,7 @@ def test_rootdn_access_day_of_week(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -246,21 +246,21 @@ def test_rootdn_access_day_of_week(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-days-allowed', allow_days)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set the deny days: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -270,14 +270,14 @@ def test_rootdn_access_day_of_week(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-days-allowed', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -295,7 +295,7 @@ def test_rootdn_access_denied_ip(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-ip', '127.0.0.1'), (ldap.MOD_ADD, 'rootdn-deny-ip', '::1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_rootdn_access_denied_ip(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -318,20 +318,20 @@ def test_rootdn_access_denied_ip(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-ip', '255.255.255.255')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -341,14 +341,14 @@ def test_rootdn_access_denied_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-deny-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -365,7 +365,7 @@ def test_rootdn_access_denied_host(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-deny-host', 'localhost.localdomain')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set deny host: error ' + e.message['desc']) assert False @@ -376,7 +376,7 @@ def test_rootdn_access_denied_host(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -388,20 +388,20 @@ def test_rootdn_access_denied_host(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-host', '
i.dont.exist.com
')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -411,14 +411,14 @@ def test_rootdn_access_denied_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-deny-host', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -438,7 +438,7 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '255.255.255.255')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to set allowed host: error ' + e.message['desc']) assert False @@ -449,7 +449,7 @@ def test_rootdn_access_allowed_ip(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -461,21 +461,21 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '127.0.0.1'), (ldap.MOD_ADD, 'rootdn-allow-ip', '::1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to set allowed host: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -485,14 +485,14 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to delete(rootdn-allow-ip): error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -512,7 +512,7 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-host', '
i.dont.exist.com
')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to set allowed host: error ' + e.message['desc']) assert False @@ -523,7 +523,7 @@ def test_rootdn_access_allowed_host(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -535,20 +535,20 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-allow-host', 'localhost.localdomain')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to set allowed host: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -558,14 +558,14 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-host', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to delete(rootdn-allow-host): error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/schema/test_schema.py b/dirsrvtests/suites/schema/test_schema.py index caeaec5..f23391a 100644 --- a/dirsrvtests/suites/schema/test_schema.py +++ b/dirsrvtests/suites/schema/test_schema.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -15,6 +15,7 @@ import os import sys import time import ldap +import six from ldap.cidict import cidict from ldap.schema import SubSchema import logging @@ -107,7 +108,7 @@ def mycmp(v1, v2): if not len(v1ary) == len(v2ary): return False for v1, v2 in zip(v1ary, v2ary): - if isinstance(v1, basestring): + if isinstance(v1, six.string_types): if not len(v1) == len(v2): return False if not v1 == v2: diff --git a/dirsrvtests/tickets/ticket365_test.py b/dirsrvtests/tickets/ticket365_test.py index a6b27ae..44aa3e8 100644 --- a/dirsrvtests/tickets/ticket365_test.py +++ b/dirsrvtests/tickets/ticket365_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -80,7 +80,7 @@ def test_ticket365(topology): 'uid': 'test_entry', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user: error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-enabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable audit log, error: ' + e.message['desc']) assert False ''' @@ -107,7 +107,7 @@ def test_ticket365(topology): try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-hide-unhashed-pw', 'off')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False @@ -116,7 +116,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_REPLACE, 'userpassword', 'mypassword')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False @@ -130,7 +130,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-hide-unhashed-pw', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to deny writing unhashed password to audit log, error: ' + e.message['desc']) assert False log.info('Test complete') @@ -140,7 +140,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_REPLACE, 'userpassword', 'hidepassword')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47384_test.py b/dirsrvtests/tickets/ticket47384_test.py index 767646c..e5dc354 100644 --- a/dirsrvtests/tickets/ticket47384_test.py +++ b/dirsrvtests/tickets/ticket47384_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -72,13 +72,13 @@ def test_ticket47384(topology): # Copy the library to our tmp directory try: shutil.copy('%s/libwhoami-plugin.so' % plugin_dir, tmp_dir) - except IOError, e: + except IOError as e: log.fatal('Failed to copy libwhoami-plugin.so to the tmp directory, error: ' + e.strerror) assert False try: shutil.copy('%s/libwhoami-plugin.la' % plugin_dir, tmp_dir) - except IOError, e: + except IOError as e: log.fatal('Failed to copy libwhoami-plugin.la to the tmp directory, error: ' + e.strerror) assert False @@ -90,7 +90,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', '%s/libwhoami-plugin' % plugin_dir)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid plugin path (%s): error (%s)' % ('%s/libwhoami-plugin' % plugin_dir, e.message['desc'])) assert False @@ -99,7 +99,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', '%s/libwhoami-plugin' % tmp_dir)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid plugin path (%s): error (%s)' % ('%s/libwhoami-plugin' % tmp_dir, e.message['desc'])) assert False @@ -108,7 +108,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', 'libwhoami-plugin')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid relative plugin path (%s): error (%s)' % ('libwhoami-plugin' % tmp_dir, e.message['desc'])) assert False @@ -125,7 +125,7 @@ def test_ticket47384(topology): except ldap.UNWILLING_TO_PERFORM: # Correct, operation should be rejected pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set invalid plugin path (%s): error (%s)' % ('/bin/libwhoami-plugin', e.message['desc'])) @@ -141,7 +141,7 @@ def test_ticket47384(topology): except ldap.UNWILLING_TO_PERFORM: # Correct, operation should be rejected pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set invalid plugin path (%s): error (%s)' % ('../libwhoami-plugin', e.message['desc'])) diff --git a/dirsrvtests/tickets/ticket47462_test.py b/dirsrvtests/tickets/ticket47462_test.py index 17854fa..c88cf43 100644 --- a/dirsrvtests/tickets/ticket47462_test.py +++ b/dirsrvtests/tickets/ticket47462_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import sys @@ -155,14 +155,14 @@ def test_ticket47462(topology): try: topology.master1.modify_s(DES_PLUGIN, [(ldap.MOD_REPLACE, 'nsslapd-pluginEnabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable DES plugin, error: ' + e.message['desc']) assert False try: topology.master1.modify_s(DES_PLUGIN, [(ldap.MOD_ADD, 'nsslapd-pluginarg2', 'description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to reset DES plugin, error: ' + e.message['desc']) assert False @@ -172,7 +172,7 @@ def test_ticket47462(topology): except ldap.NO_SUCH_ATTRIBUTE: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to reset MMR plugin, error: ' + e.message['desc']) assert False @@ -183,7 +183,7 @@ def test_ticket47462(topology): topology.master1.delete_s(AES_PLUGIN) except ldap.NO_SUCH_OBJECT: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete AES plugin, error: ' + e.message['desc']) assert False @@ -201,7 +201,7 @@ def test_ticket47462(topology): else: log.fatal('No replication agreements!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to search for replica credentials: ' + e.message['desc']) assert False @@ -235,7 +235,7 @@ def test_ticket47462(topology): assert False else: log.info('Replication test passed') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add test user: ' + e.message['desc']) assert False @@ -261,7 +261,7 @@ def test_ticket47462(topology): else: log.fatal('Failed to find any entries with nsDS5ReplicaCredentials ') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to search for replica credentials: ' + e.message['desc']) assert False @@ -278,7 +278,7 @@ def test_ticket47462(topology): assert False else: log.info('The AES plugin was correctly setup') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -292,7 +292,7 @@ def test_ticket47462(topology): assert False else: log.info('The MMR plugin was correctly updated') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_ticket47462(topology): assert False else: log.info('The DES plugin was correctly updated') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -332,7 +332,7 @@ def test_ticket47462(topology): assert False else: log.info('Replication test passed') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add test user: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47640_test.py b/dirsrvtests/tickets/ticket47640_test.py index ef9cdd5..cd450ab 100644 --- a/dirsrvtests/tickets/ticket47640_test.py +++ b/dirsrvtests/tickets/ticket47640_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -66,13 +66,13 @@ def test_ticket47640(topology): # Enable Dynamic plugins, and the linked Attrs plugin try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False try: topology.standalone.plugins.enable(name=PLUGIN_LINKED_ATTRS) - except ValueError, e: + except ValueError as e: ldap.fatal('Failed to enable linked attributes plugin!' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_ticket47640(topology): 'linkType': 'seeAlso', 'managedType': 'seeAlso' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add linked attr config entry: error ' + e.message['desc']) assert False @@ -100,7 +100,7 @@ def test_ticket47640(topology): # Success log.info('Add operation correctly rejected.') OP_REJECTED = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Add operation incorrectly rejected: error %s - ' + 'expected "unwilling to perform"' % e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47653MMR_test.py b/dirsrvtests/tickets/ticket47653MMR_test.py index b08501b..0c6da02 100644 --- a/dirsrvtests/tickets/ticket47653MMR_test.py +++ b/dirsrvtests/tickets/ticket47653MMR_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -300,7 +300,7 @@ def test_ticket47653_add(topology): topology.master1.log.info("Try to add Add %s should be successful" % ENTRY_DN) try: topology.master1.add_s(entry_with_member) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.master1.log.info("Failed to add entry, error: " + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47669_test.py b/dirsrvtests/tickets/ticket47669_test.py index dccfdcc..5458fba 100644 --- a/dirsrvtests/tickets/ticket47669_test.py +++ b/dirsrvtests/tickets/ticket47669_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -33,6 +33,7 @@ COMPACTDBINTERVAL = 'nsslapd-changelogcompactdb-interval' FILTER = '(cn=*)' + class TopologyStandalone(object): def __init__(self, standalone): standalone.open() @@ -77,6 +78,7 @@ def topology(request): # Here we have standalone instance up and running return TopologyStandalone(standalone) + def test_ticket47669_init(topo): """ Add cn=changelog5,cn=config @@ -93,19 +95,20 @@ def test_ticket47669_init(topo): topo.standalone.add_s(Entry((CHANGELOG, {'objectclass': 'top extensibleObject'.split(), 'nsslapd-changelogdir': changelogdir}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + CHANGELOG + ': error ' + e.message['desc']) assert False try: topo.standalone.modify_s(RETROCHANGELOG, [(ldap.MOD_REPLACE, 'nsslapd-pluginEnabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable ' + RETROCHANGELOG + ': error ' + e.message['desc']) assert False # restart the server topo.standalone.restart(timeout=10) + def add_and_check(topo, plugin, attr, val, isvalid): """ Helper function to add/replace attr: val and check the added value @@ -114,7 +117,7 @@ def add_and_check(topo, plugin, attr, val, isvalid): log.info('Test %s: %s -- valid' % (attr, val)) try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) assert False else: @@ -122,12 +125,12 @@ def add_and_check(topo, plugin, attr, val, isvalid): if plugin == CHANGELOG: try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Expectedly failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) else: try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) try: @@ -145,7 +148,7 @@ def add_and_check(topo, plugin, attr, val, isvalid): if not entries[0].hasValue(attr, val): log.fatal('%s does not have expected (%s: %s)' % (plugin, attr, val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (plugin, e.message['desc'])) assert False @@ -169,6 +172,7 @@ def test_ticket47669_changelog_maxage(topo): add_and_check(topo, CHANGELOG, MAXAGE, '-123', False) add_and_check(topo, CHANGELOG, MAXAGE, 'xyz', False) + def test_ticket47669_changelog_triminterval(topo): """ Test nsslapd-changelogtrim-interval in cn=changelog5,cn=config @@ -188,6 +192,7 @@ def test_ticket47669_changelog_triminterval(topo): add_and_check(topo, CHANGELOG, TRIMINTERVAL, '-123', False) add_and_check(topo, CHANGELOG, TRIMINTERVAL, 'xyz', False) + def test_ticket47669_changelog_compactdbinterval(topo): """ Test nsslapd-changelogcompactdb-interval in cn=changelog5,cn=config @@ -207,6 +212,7 @@ def test_ticket47669_changelog_compactdbinterval(topo): add_and_check(topo, CHANGELOG, COMPACTDBINTERVAL, '-123', False) add_and_check(topo, CHANGELOG, COMPACTDBINTERVAL, 'xyz', False) + def test_ticket47669_retrochangelog_maxage(topo): """ Test nsslapd-changelogmaxage in cn=Retro Changelog Plugin,cn=plugins,cn=config @@ -228,10 +234,12 @@ def test_ticket47669_retrochangelog_maxage(topo): topo.standalone.log.info("ticket47669 was successfully verified.") + def test_ticket47669_final(topology): topology.standalone.delete() log.info('Testcase PASSED') + def run_isolated(): """ run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) diff --git a/dirsrvtests/tickets/ticket47714_test.py b/dirsrvtests/tickets/ticket47714_test.py index c49d455..400c243 100644 --- a/dirsrvtests/tickets/ticket47714_test.py +++ b/dirsrvtests/tickets/ticket47714_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -135,7 +135,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -148,7 +148,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s again ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -170,7 +170,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s again to fail ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.info('CONSTRAINT VIOLATION ' + e.message['desc']) log.info("%s was successfully inactivated." % TEST_USER_DN) pass @@ -206,7 +206,7 @@ def test_ticket47714_run_1(topology): log.info("\n######################### Bind as %s ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -219,7 +219,7 @@ def test_ticket47714_run_1(topology): log.info("\n######################### Bind as %s again ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) diff --git a/dirsrvtests/tickets/ticket47781_test.py b/dirsrvtests/tickets/ticket47781_test.py index 8bcb926..c52612e 100644 --- a/dirsrvtests/tickets/ticket47781_test.py +++ b/dirsrvtests/tickets/ticket47781_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -103,7 +103,7 @@ def test_ticket47781(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry 1: ' + e.message['desc']) assert False @@ -112,7 +112,7 @@ def test_ticket47781(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry2'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry 2: ' + e.message['desc']) assert False @@ -158,7 +158,7 @@ def test_ticket47781(topology): if not entries: log.fatal('Search failed to find any entries.') assert PR_False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert PR_False diff --git a/dirsrvtests/tickets/ticket47815_test.py b/dirsrvtests/tickets/ticket47815_test.py index 34a14c0..675e97b 100644 --- a/dirsrvtests/tickets/ticket47815_test.py +++ b/dirsrvtests/tickets/ticket47815_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -131,7 +131,7 @@ def test_ticket47815(topology): except ldap.UNWILLING_TO_PERFORM: log.debug('Adding invalid entry failed as expected') result = 53 - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Unexpected result ' + e.message['desc']) assert False if result == 0: @@ -147,7 +147,7 @@ def test_ticket47815(topology): except ldap.UNWILLING_TO_PERFORM: log.debug('2nd add of invalid entry failed as expected') result2 = 53 - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Unexpected result ' + e.message['desc']) assert False if result2 == 0: diff --git a/dirsrvtests/tickets/ticket47819_test.py b/dirsrvtests/tickets/ticket47819_test.py index 6574d61..435b36c 100644 --- a/dirsrvtests/tickets/ticket47819_test.py +++ b/dirsrvtests/tickets/ticket47819_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -97,13 +97,13 @@ def test_ticket47819(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry: ' + e.message['desc']) assert False try: topology.standalone.delete_s('cn=entry1,dc=example,dc=com') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete entry: ' + e.message['desc']) assert False @@ -114,7 +114,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search failed to the new tombstone(nsTombstoneCSN is probably missing).') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -169,7 +169,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search failed to fine the new tombstone(nsTombstoneCSN is probably missing).') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -198,7 +198,7 @@ def test_ticket47819(topology): if entries: log.fatal('Search found tombstones with nsTombstoneCSN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -218,7 +218,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search did not find any fixed-up tombstones') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -249,7 +249,7 @@ def test_ticket47819(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry: ' + e.message['desc']) assert False @@ -265,7 +265,7 @@ def test_ticket47819(topology): if entries: log.fatal('Search unexpectedly found tombstones') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47900_test.py b/dirsrvtests/tickets/ticket47900_test.py index fde297b..c01b733 100644 --- a/dirsrvtests/tickets/ticket47900_test.py +++ b/dirsrvtests/tickets/ticket47900_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -99,7 +99,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Creating Password Administator entry %s..." % ADMIN_DN) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Unexpected result ' + e.message['desc']) assert False topology.standalone.log.error("Failed to add Password Administator %s, error: %s " @@ -115,7 +115,7 @@ def test_ticket47900(topology): (ldap.MOD_REPLACE, 'passwordExp' , 'on'), (ldap.MOD_REPLACE, 'passwordMinDigits' , '1'), (ldap.MOD_REPLACE, 'passwordMinSpecials' , '1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed configure password policy: ' + e.message['desc']) assert False @@ -132,7 +132,7 @@ def test_ticket47900(topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add aci for password admin: ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Bind as the Password Administator (before activating)...") try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -164,7 +164,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Create a regular user entry %s with password (%s)..." % (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True topology.standalone.log.info('Add failed as expected: password (%s) result (%s)' @@ -184,21 +184,21 @@ def test_ticket47900(topology): # Bind as Root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add password admin to config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -210,7 +210,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Create a regular user entry %s with password (%s)..." % (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add entry with password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -220,7 +220,7 @@ def test_ticket47900(topology): # Delete entry for the next pass try: topology.standalone.delete_s(ENTRY_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to delete entry: %s' % (e.message['desc'])) assert False @@ -230,7 +230,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', ADMIN_PWD) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add entry with valid password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -243,21 +243,21 @@ def test_ticket47900(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_DELETE, 'passwordAdminDN', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to remove password admin from config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -269,7 +269,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True topology.standalone.log.info('Password update failed as expected: password (%s) result (%s)' @@ -288,21 +288,21 @@ def test_ticket47900(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add password admin to config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -313,7 +313,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47920_test.py b/dirsrvtests/tickets/ticket47920_test.py index 139cb06..d4f6a53 100644 --- a/dirsrvtests/tickets/ticket47920_test.py +++ b/dirsrvtests/tickets/ticket47920_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -161,7 +161,7 @@ def test_ticket47920_mod_readentry_ctrl(topology): assert resp_ctrls[0].dn == ACTIVE_USER_DN assert 'description' in resp_ctrls[0].entry assert 'cn' in resp_ctrls[0].entry - print resp_ctrls[0].entry['description'] + print(resp_ctrls[0].entry['description']) ent = topology.standalone.getEntry(ACTIVE_USER_DN, ldap.SCOPE_BASE, "(objectclass=*)", ['description']) assert ent.hasAttr('description') diff --git a/dirsrvtests/tickets/ticket47921_test.py b/dirsrvtests/tickets/ticket47921_test.py index e8067bc..4f3d54e 100644 --- a/dirsrvtests/tickets/ticket47921_test.py +++ b/dirsrvtests/tickets/ticket47921_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -73,7 +73,7 @@ def test_ticket47921(topology): 'cosIndirectSpecifier': 'manager', 'cosAttribute': 'roomnumber' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add cos defintion, error: ' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_ticket47921(topology): 'uid': 'my manager', 'roomnumber': '1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add manager entry, error: ' + e.message['desc']) assert False @@ -98,7 +98,7 @@ def test_ticket47921(topology): 'uid': 'user', 'manager': MANAGER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add manager entry, error: ' + e.message['desc']) assert False @@ -114,14 +114,14 @@ def test_ticket47921(topology): else: log.fatal('Failed to find user entry') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search for user entry: ' + e.message['desc']) assert False # Modify manager entry try: topology.standalone.modify_s(MANAGER_DN, [(ldap.MOD_REPLACE, 'roomnumber', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modify manager entry: ' + e.message['desc']) assert False @@ -137,7 +137,7 @@ def test_ticket47921(topology): else: log.fatal('Failed to find user entry') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search for user entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47927_test.py b/dirsrvtests/tickets/ticket47927_test.py index e389ff4..78e0b29 100644 --- a/dirsrvtests/tickets/ticket47927_test.py +++ b/dirsrvtests/tickets/ticket47927_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -74,6 +74,7 @@ def topology(request): return TopologyStandalone(standalone) + def test_ticket47927_init(topology): topology.standalone.plugins.enable(name=PLUGIN_ATTR_UNIQUENESS) try: @@ -81,7 +82,7 @@ def test_ticket47927_init(topology): [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'telephonenumber'), (ldap.MOD_REPLACE, 'uniqueness-subtrees', DEFAULT_SUFFIX), ]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927: Failed to configure plugin for "telephonenumber": error ' + e.message['desc']) assert False topology.standalone.restart(timeout=120) @@ -111,7 +112,8 @@ def test_ticket47927_init(topology): 'objectclass': "top person".split(), 'sn': USER_4_CN, 'cn': USER_4_CN}))) - + + def test_ticket47927_one(topology): ''' Check that uniqueness is enforce on all SUFFIX @@ -120,7 +122,7 @@ def test_ticket47927_one(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed to set the telephonenumber for %s: %s' % (USER_1_DN, e.message['desc'])) assert False @@ -130,7 +132,7 @@ def test_ticket47927_one(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_one: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN, e.message['desc'])) pass @@ -141,7 +143,7 @@ def test_ticket47927_one(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_one: unexpected success to set the telephonenumber for %s' % (USER_3_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed (expected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) pass @@ -153,11 +155,12 @@ def test_ticket47927_two(topology): try: topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-exclude-subtrees', EXCLUDED_CONTAINER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_two: Failed to configure plugin for to exclude %s: error %s' % (EXCLUDED_CONTAINER_DN, e.message['desc'])) assert False topology.standalone.restart(timeout=120) + def test_ticket47927_three(topology): ''' Check that uniqueness is enforced on full SUFFIX except EXCLUDED_CONTAINER_DN @@ -168,17 +171,17 @@ def test_ticket47927_three(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed to set the telephonenumber ' + e.message['desc']) assert False - + # we should not be allowed to set this value (because user1 is in the scope) try: topology.standalone.modify_s(USER_2_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_three: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN , e.message['desc'])) @@ -187,7 +190,7 @@ def test_ticket47927_three(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_three: success to set the telephonenumber for %s' % (USER_3_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False @@ -204,7 +207,7 @@ def test_ticket47927_four(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_four: success to set the telephonenumber for %s' % USER_3_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False @@ -213,7 +216,7 @@ def test_ticket47927_four(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed to set the telephonenumber for %s: %s' % (USER_1_DN, e.message['desc'])) assert False @@ -223,10 +226,11 @@ def test_ticket47927_four(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_four: unexpected success to set the telephonenumber %s' % USER_2_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN, e.message['desc'])) pass + def test_ticket47927_five(topology): ''' Exclude the EXCLUDED_BIS_CONTAINER_DN from the uniqueness plugin @@ -234,12 +238,13 @@ def test_ticket47927_five(topology): try: topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_ADD, 'uniqueness-exclude-subtrees', EXCLUDED_BIS_CONTAINER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_five: Failed to configure plugin for to exclude %s: error %s' % (EXCLUDED_BIS_CONTAINER_DN, e.message['desc'])) assert False topology.standalone.restart(timeout=120) topology.standalone.getEntry('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', ldap.SCOPE_BASE) + def test_ticket47927_six(topology): ''' Check that uniqueness is enforced on full SUFFIX except EXCLUDED_CONTAINER_DN @@ -247,21 +252,21 @@ def test_ticket47927_six(topology): First case: it exists an entry (with the same attribute value) in the scope of the plugin and we set the value in an entry that is in an excluded scope ''' - UNIQUE_VALUE='222' + UNIQUE_VALUE = '222' try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed to set the telephonenumber ' + e.message['desc']) assert False - + # we should not be allowed to set this value (because user1 is in the scope) try: topology.standalone.modify_s(USER_2_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN , e.message['desc'])) @@ -270,7 +275,7 @@ def test_ticket47927_six(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: success to set the telephonenumber for %s' % (USER_3_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False # USER_4_DN is in EXCLUDED_CONTAINER_DN so update should be successful @@ -278,7 +283,7 @@ def test_ticket47927_six(topology): topology.standalone.modify_s(USER_4_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: success to set the telephonenumber for %s' % (USER_4_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_4_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47937_test.py b/dirsrvtests/tickets/ticket47937_test.py index 7a65db6..6c09cf8 100644 --- a/dirsrvtests/tickets/ticket47937_test.py +++ b/dirsrvtests/tickets/ticket47937_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -81,7 +81,7 @@ def test_ticket47937(topology): except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=people org unit: error ' + e.message['desc']) assert False @@ -92,7 +92,7 @@ def test_ticket47937(topology): 'ou': 'ranges' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=ranges org unit: error ' + e.message['desc']) assert False @@ -103,7 +103,7 @@ def test_ticket47937(topology): 'cn': 'entry' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test entry: error ' + e.message['desc']) assert False @@ -117,7 +117,7 @@ def test_ticket47937(topology): 'dnaRemainingValues': '9501' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add shared config entry: error ' + e.message['desc']) assert False @@ -134,7 +134,7 @@ def test_ticket47937(topology): 'dnaSharedCfgDN': 'ou=ranges,%s' % SUFFIX }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add DNA config entry: error ' + e.message['desc']) assert False @@ -156,7 +156,7 @@ def test_ticket47937(topology): try: topology.standalone.modify_s('cn=dna config,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'dnaType', 'foo')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('Operation failed as expected (error: %s)' % e.message['desc']) else: log.error('Operation incorectly succeeded! Test Failed!') diff --git a/dirsrvtests/tickets/ticket47950_test.py b/dirsrvtests/tickets/ticket47950_test.py index a1bf48c..7226637 100644 --- a/dirsrvtests/tickets/ticket47950_test.py +++ b/dirsrvtests/tickets/ticket47950_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -85,7 +85,7 @@ def test_ticket47950(topology): try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'nsslapd-plugin-binddn-tracking', 'on')]) log.info('nsslapd-plugin-binddn-tracking enabled.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable bind dn tracking: ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_ticket47950(topology): 'sn': "1", 'cn': "user 1"}))) log.info('Added test user %s' % USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add %s: %s' % (USER1_DN, e.message['desc'])) assert False @@ -109,7 +109,7 @@ def test_ticket47950(topology): 'sn': "2", 'cn': "user 2"}))) log.info('Added test user %s' % USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: ' + e.message['desc']) assert False @@ -122,7 +122,7 @@ def test_ticket47950(topology): topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_ADD, 'aci', acival)]) log.info('Added aci') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add aci: ' + e.message['desc']) assert False @@ -132,14 +132,14 @@ def test_ticket47950(topology): try: topology.standalone.simple_bind_s(USER1_DN, "password") log.info('Bind as user %s successful' % USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to bind as user1: ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER2_DN, [(ldap.MOD_REPLACE, 'cn', 'new value')]) log.info('%s successfully modified user %s' % (USER1_DN, USER2_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to update user2: ' + e.message['desc']) assert False @@ -149,7 +149,7 @@ def test_ticket47950(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) log.info('Bind as %s successful' % DN_DM) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -171,7 +171,7 @@ def test_ticket47950(topology): repl_agreement = topology.standalone.agreement.create(suffix=DEFAULT_SUFFIX, host="127.0.0.1", port="7777", properties=properties) log.info('Successfully created replication agreement') - except InvalidArgumentError, e: + except InvalidArgumentError as e: log.error('Failed to create replication agreement: ' + e.message['desc']) assert False @@ -182,7 +182,7 @@ def test_ticket47950(topology): properties = {REPLICA_ID: "7"} topology.standalone.replica.setProperties(DEFAULT_SUFFIX, None, None, properties) log.info('Successfully modified replica') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to update replica config: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47953_test.py b/dirsrvtests/tickets/ticket47953_test.py index 4e8acf8..f64d899 100644 --- a/dirsrvtests/tickets/ticket47953_test.py +++ b/dirsrvtests/tickets/ticket47953_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -98,7 +98,7 @@ def test_ticket47953(topology): try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_DELETE, 'aci', acival)]) log.info('Removed invalid aci.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to remove invalid aci: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47963_test.py b/dirsrvtests/tickets/ticket47963_test.py index b3366af..deed905 100644 --- a/dirsrvtests/tickets/ticket47963_test.py +++ b/dirsrvtests/tickets/ticket47963_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -75,7 +75,7 @@ def test_ticket47963(topology): topology.standalone.plugins.enable(name=PLUGIN_MEMBER_OF) try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofskipnested', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_automember: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_ticket47963(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'test_user' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add teset user: error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_ticket47963(topology): 'cn': 'group1', 'member': USER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group1: error ' + e.message['desc']) assert False @@ -109,7 +109,7 @@ def test_ticket47963(topology): 'cn': 'group2', 'member': USER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group2: error ' + e.message['desc']) assert False @@ -119,7 +119,7 @@ def test_ticket47963(topology): 'objectclass': 'top groupOfNames groupOfUniqueNames extensibleObject'.split(), 'cn': 'group' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group3: error ' + e.message['desc']) assert False time.sleep(1) @@ -133,14 +133,14 @@ def test_ticket47963(topology): if not entries: log.fatal('User is missing expected memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False # Add the user to the group try: topology.standalone.modify_s(GROUP_DN3, [(ldap.MOD_ADD, 'member', USER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to member to group: error ' + e.message['desc']) assert False time.sleep(1) @@ -153,7 +153,7 @@ def test_ticket47963(topology): if not entries: log.fatal('User is missing expected memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False @@ -162,7 +162,7 @@ def test_ticket47963(topology): # try: topology.standalone.delete_s(GROUP_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test group2: ' + e.message['desc']) assert False time.sleep(1) @@ -173,7 +173,7 @@ def test_ticket47963(topology): if not entries: log.fatal('User incorrect memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47970_test.py b/dirsrvtests/tickets/ticket47970_test.py index b0199f8..a748939 100644 --- a/dirsrvtests/tickets/ticket47970_test.py +++ b/dirsrvtests/tickets/ticket47970_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -86,14 +86,14 @@ def test_ticket47970(topology): try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'passwordLockout', 'on')]) log.info('account lockout enabled.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable account lockout: ' + e.message['desc']) assert False try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'passwordMaxFailure', '5')]) log.info('passwordMaxFailure set.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to to set passwordMaxFailure: ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_ticket47970(topology): pw = "secret" auth_tokens = ldap.sasl.digest_md5(user_name, pw) topology.standalone.sasl_interactive_bind_s("", auth_tokens) - except ldap.INVALID_CREDENTIALS, e: + except ldap.INVALID_CREDENTIALS as e: log.info("SASL Bind failed as expected") failed_as_expected = True @@ -121,7 +121,7 @@ def test_ticket47970(topology): entry = topology.standalone.search_s("", ldap.SCOPE_BASE, "passwordRetryCount=*", ['passwordRetryCount']) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search Root DSE entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47973_test.py b/dirsrvtests/tickets/ticket47973_test.py index dfe9bb5..12bb789 100644 --- a/dirsrvtests/tickets/ticket47973_test.py +++ b/dirsrvtests/tickets/ticket47973_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -83,7 +83,7 @@ def task_complete(conn, task_dn): if task_entry[0].hasAttr('nstaskexitcode'): # task is done finished = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('wait_for_task: Search failed: ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_ticket47973(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -126,7 +126,7 @@ def test_ticket47973(topology): 'objectclass': 'top extensibleObject'.split(), 'cn': 'task-' + str(task_count) }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add task entry: error ' + e.message['desc']) assert False @@ -145,7 +145,7 @@ def test_ticket47973(topology): if not entries or not entries[0]: log.fatal('User was not returned from search!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47980_test.py b/dirsrvtests/tickets/ticket47980_test.py index 256f195..34f0d3f 100644 --- a/dirsrvtests/tickets/ticket47980_test.py +++ b/dirsrvtests/tickets/ticket47980_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -139,7 +139,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level1: error ' + e.message['desc']) assert False @@ -148,7 +148,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level2: error ' + e.message['desc']) assert False @@ -157,7 +157,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'level3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level3: error ' + e.message['desc']) assert False @@ -169,7 +169,7 @@ def test_ticket47980(topology): }))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level4: error ' + e.message['desc']) assert False @@ -178,7 +178,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level5' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level5: error ' + e.message['desc']) assert False @@ -187,7 +187,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'level6' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level6: error ' + e.message['desc']) assert False @@ -197,7 +197,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -206,7 +206,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user2: error ' + e.message['desc']) assert False @@ -215,7 +215,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user3: error ' + e.message['desc']) assert False @@ -224,7 +224,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user4' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user4: error ' + e.message['desc']) assert False @@ -233,7 +233,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user5' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user5: error ' + e.message['desc']) assert False @@ -242,14 +242,14 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user6' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user6: error ' + e.message['desc']) assert False # Enable password policy try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -262,7 +262,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level1: error ' + e.message['desc']) assert False @@ -278,7 +278,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level1: error ' + e.message['desc']) assert False @@ -291,7 +291,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level1,dc=example,dc=com', 'pwdpolicysubentry': BRANCH1_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level1: error ' + e.message['desc']) assert False @@ -303,7 +303,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH1_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level1: error ' + e.message['desc']) assert False @@ -316,7 +316,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level2: error ' + e.message['desc']) assert False @@ -332,7 +332,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level2: error ' + e.message['desc']) assert False @@ -345,7 +345,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level2,dc=example,dc=com', 'pwdpolicysubentry': BRANCH2_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level2: error ' + e.message['desc']) assert False @@ -357,7 +357,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH2_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level2: error ' + e.message['desc']) assert False @@ -370,7 +370,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level3: error ' + e.message['desc']) assert False @@ -386,7 +386,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level3: error ' + e.message['desc']) assert False @@ -399,7 +399,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level3,dc=example,dc=com', 'pwdpolicysubentry': BRANCH3_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level3: error ' + e.message['desc']) assert False @@ -411,7 +411,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH3_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level3: error ' + e.message['desc']) assert False @@ -424,7 +424,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level3: error ' + e.message['desc']) assert False @@ -440,7 +440,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch4: error ' + e.message['desc']) assert False @@ -453,7 +453,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH4_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level3: error ' + e.message['desc']) assert False @@ -465,7 +465,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH4_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for branch4: error ' + e.message['desc']) assert False @@ -478,7 +478,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for branch5: error ' + e.message['desc']) assert False @@ -494,7 +494,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch5: error ' + e.message['desc']) assert False @@ -507,7 +507,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=lower,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH5_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for branch5: error ' + e.message['desc']) assert False @@ -519,7 +519,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH5_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level3: error ' + e.message['desc']) assert False @@ -532,7 +532,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for branch6: error ' + e.message['desc']) assert False @@ -548,7 +548,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch6: error ' + e.message['desc']) assert False @@ -561,7 +561,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=lower,ou=lower,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH6_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for branch6: error ' + e.message['desc']) assert False @@ -573,7 +573,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH6_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for branch6: error ' + e.message['desc']) assert False @@ -587,7 +587,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH1_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER1_DN, e.message['desc'])) assert False @@ -596,7 +596,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH2_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER2_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER2_DN, e.message['desc'])) assert False @@ -605,7 +605,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH3_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER3_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER3_DN, e.message['desc'])) assert False @@ -614,7 +614,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH4_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER4_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER4_DN, e.message['desc'])) assert False @@ -623,7 +623,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH5_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER5_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER5_DN, e.message['desc'])) assert False @@ -632,7 +632,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH6_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER6_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER6_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47981_test.py b/dirsrvtests/tickets/ticket47981_test.py index 00025ea..b25d7dd 100644 --- a/dirsrvtests/tickets/ticket47981_test.py +++ b/dirsrvtests/tickets/ticket47981_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -89,7 +89,7 @@ def addSubtreePwPolicy(inst): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for ou=people: error ' + e.message['desc']) assert False @@ -105,7 +105,7 @@ def addSubtreePwPolicy(inst): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy: error ' + e.message['desc']) assert False @@ -118,7 +118,7 @@ def addSubtreePwPolicy(inst): 'cn': 'cn=nsPwTemplateEntry,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template: error ' + e.message['desc']) assert False @@ -130,7 +130,7 @@ def addSubtreePwPolicy(inst): 'costemplatedn': BRANCH_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def: error ' + e.message['desc']) assert False time.sleep(0.5) @@ -139,25 +139,25 @@ def addSubtreePwPolicy(inst): def delSubtreePwPolicy(inst): try: inst.delete_s(BRANCH_COS_DEF) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS def: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_COS_TMPL) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS template: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_PWP) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS password policy: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_CONTAINER) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS container: error ' + e.message['desc']) assert False time.sleep(0.5) @@ -185,7 +185,7 @@ def test_ticket47981(topology): 'o': BE_NAME}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to create suffix entry: error ' + e.message['desc']) assert False @@ -201,7 +201,7 @@ def test_ticket47981(topology): }))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=people: error ' + e.message['desc']) assert False @@ -213,7 +213,7 @@ def test_ticket47981(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -222,7 +222,7 @@ def test_ticket47981(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -239,7 +239,7 @@ def test_ticket47981(topology): if not entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False @@ -252,7 +252,7 @@ def test_ticket47981(topology): if entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User unexpectedly does have the pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False @@ -265,7 +265,7 @@ def test_ticket47981(topology): if not entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket48026_test.py b/dirsrvtests/tickets/ticket48026_test.py index 5072469..f8d440f 100644 --- a/dirsrvtests/tickets/ticket48026_test.py +++ b/dirsrvtests/tickets/ticket48026_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -75,7 +75,7 @@ def test_ticket48026(topology): (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress'), ]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48026: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -90,7 +90,7 @@ def test_ticket48026(topology): 'mail': 'user1(a)example.com', 'mailAlternateAddress' : 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48026: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48109_test.py b/dirsrvtests/tickets/ticket48109_test.py index 91c1595..e4091e0 100644 --- a/dirsrvtests/tickets/ticket48109_test.py +++ b/dirsrvtests/tickets/ticket48109_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -74,14 +74,14 @@ def test_ticket48109_0(topology): (ldap.MOD_ADD, 'nsIndexType', 'sub'), (ldap.MOD_ADD, 'nsSubStrBegin', '2'), (ldap.MOD_ADD, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'auser0' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -91,7 +91,7 @@ def test_ticket48109_0(topology): 'sn': 'user0', 'givenname': 'a', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -143,7 +143,7 @@ def test_ticket48109_0(topology): (ldap.MOD_DELETE, 'nsIndexType', 'sub'), (ldap.MOD_DELETE, 'nsSubStrBegin', '2'), (ldap.MOD_DELETE, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False @@ -162,14 +162,14 @@ def test_ticket48109_1(topology): [(ldap.MOD_ADD, 'nsIndexType', 'sub'), (ldap.MOD_ADD, 'nsMatchingRule', 'nssubstrbegin=2'), (ldap.MOD_ADD, 'nsMatchingRule', 'nssubstrend=2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'buser1' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -179,7 +179,7 @@ def test_ticket48109_1(topology): 'sn': 'user1', 'givenname': 'b', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -230,7 +230,7 @@ def test_ticket48109_1(topology): [(ldap.MOD_DELETE, 'nsIndexType', 'sub'), (ldap.MOD_DELETE, 'nsMatchingRule', 'nssubstrbegin=2'), (ldap.MOD_DELETE, 'nsMatchingRule', 'nssubstrend=2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False @@ -257,14 +257,14 @@ def test_ticket48109_2(topology): (ldap.MOD_ADD, 'objectClass', 'extensibleObject'), (ldap.MOD_ADD, 'nsSubStrBegin', '2'), (ldap.MOD_ADD, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'cuser2' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -274,7 +274,7 @@ def test_ticket48109_2(topology): 'sn': 'user2', 'givenname': 'c', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -366,7 +366,7 @@ def test_ticket48109_2(topology): (ldap.MOD_DELETE, 'objectClass', 'extensibleObject'), (ldap.MOD_DELETE, 'nsSubStrBegin', '2'), (ldap.MOD_DELETE, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48191_test.py b/dirsrvtests/tickets/ticket48191_test.py index 319dab6..000975a 100644 --- a/dirsrvtests/tickets/ticket48191_test.py +++ b/dirsrvtests/tickets/ticket48191_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -142,6 +142,7 @@ def test_ticket48191_setup(topology): topology.standalone.log.info('%d entries are successfully imported.' % dnnum) + def test_ticket48191_run_0(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (no nsslapd-maxsimplepaged-per-conn) ######################\n") @@ -198,6 +199,7 @@ def test_ticket48191_run_0(topology): assert dnnum == len(entries) assert pages == (dnnum / page_size) + def test_ticket48191_run_1(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (nsslapd-maxsimplepaged-per-conn: 0) ######################\n") @@ -220,16 +222,17 @@ def test_ticket48191_run_1(topology): topology.standalone.log.fatal('Unexpected success') try: rtype, rdata, rmsgid, responcectrls = topology.standalone.result3(msgid, resp_ctrl_classes=known_ldap_resp_ctrls) - except ldap.UNWILLING_TO_PERFORM, e: + except ldap.UNWILLING_TO_PERFORM as e: topology.standalone.log.info('Returned the expected RC UNWILLING_TO_PERFORM') return - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.fatal('Unexpected error: ' + e.message['desc']) assert False topology.standalone.log.info("Type %d" % rtype) topology.standalone.log.info("%d results" % len(rdata)) assert False + def test_ticket48191_run_2(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (nsslapd-maxsimplepaged-per-conn: 1000) ######################\n") diff --git a/dirsrvtests/tickets/ticket48214_test.py b/dirsrvtests/tickets/ticket48214_test.py index afbef22..14bf392 100644 --- a/dirsrvtests/tickets/ticket48214_test.py +++ b/dirsrvtests/tickets/ticket48214_test.py @@ -111,7 +111,7 @@ def checkMaxBerSize(topology): else: topology.standalone.log.fatal('ERROR: cn=config is not found?') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('ERROR: Failed to search for user entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48228_test.py b/dirsrvtests/tickets/ticket48228_test.py index e0595bb..bb20620 100644 --- a/dirsrvtests/tickets/ticket48228_test.py +++ b/dirsrvtests/tickets/ticket48228_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -33,6 +33,7 @@ SUBTREE_COS_DEF = 'cn=nsPwPolicy_CoS,' + DEFAULT_SUFFIX USER1_DN = 'uid=user1,' + DEFAULT_SUFFIX USER2_DN = 'uid=user2,' + DEFAULT_SUFFIX + class TopologyStandalone(object): def __init__(self, standalone): standalone.open() @@ -77,20 +78,21 @@ def topology(request): # Here we have standalone instance up and running return TopologyStandalone(standalone) + def set_global_pwpolicy(topology, inhistory): log.info(" +++++ Enable global password policy +++++\n") topology.standalone.simple_bind_s(DN_DM, PASSWORD) # Enable password policy try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False log.info(" Set global password history on\n") try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'passwordHistory', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set passwordHistory: error ' + e.message['desc']) assert False @@ -98,10 +100,11 @@ def set_global_pwpolicy(topology, inhistory): try: count = "%d" % inhistory topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'passwordInHistory', count)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set passwordInHistory: error ' + e.message['desc']) assert False + def set_subtree_pwpolicy(topology): log.info(" +++++ Enable subtree level password policy +++++\n") topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -109,7 +112,7 @@ def set_subtree_pwpolicy(topology): try: topology.standalone.add_s(Entry((SUBTREE_CONTAINER, {'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container: error ' + e.message['desc']) assert False @@ -124,7 +127,7 @@ def set_subtree_pwpolicy(topology): 'passwordMinAge': '0', 'passwordChange': 'on', 'passwordStorageScheme': 'clear'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy: error ' + e.message['desc']) assert False @@ -135,7 +138,7 @@ def set_subtree_pwpolicy(topology): 'cosPriority': '1', 'cn': SUBTREE_COS_TMPLDN, 'pwdpolicysubentry': SUBTREE_PWP}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template: error ' + e.message['desc']) assert False @@ -145,21 +148,23 @@ def set_subtree_pwpolicy(topology): 'cn': SUBTREE_PWPDN, 'costemplatedn': SUBTREE_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def: error ' + e.message['desc']) assert False + def check_passwd_inhistory(topology, user, cpw, passwd): inhistory = 0 log.info(" Bind as {%s,%s}" % (user, cpw)) topology.standalone.simple_bind_s(user, cpw) try: topology.standalone.modify_s(user, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info(' The password ' + passwd + ' of user' + USER1_DN + ' in history: error ' + e.message['desc']) inhistory = 1 return inhistory + def update_passwd(topology, user, passwd, times): cpw = passwd loop = 0 @@ -169,7 +174,7 @@ def update_passwd(topology, user, passwd, times): cpw = 'password%d' % loop try: topology.standalone.modify_s(user, [(ldap.MOD_REPLACE, 'userpassword', cpw)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to update the password ' + cpw + ' of user ' + user + ': error ' + e.message['desc']) assert False loop += 1 @@ -178,6 +183,7 @@ def update_passwd(topology, user, passwd, times): inhistory = check_passwd_inhistory(topology, user, cpw, passwd) assert inhistory == 1 + def test_ticket48228_test_global_policy(topology): """ Check global password policy @@ -199,7 +205,7 @@ def test_ticket48228_test_global_policy(topology): 'givenname': 'user', 'mail': 'user1(a)example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to add user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -235,6 +241,7 @@ def test_ticket48228_test_global_policy(topology): log.info("Global policy was successfully verified.") + def test_ticket48228_test_subtree_policy(topology): """ Check subtree level password policy @@ -256,7 +263,7 @@ def test_ticket48228_test_subtree_policy(topology): 'givenname': 'user', 'mail': 'user2(a)example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to add user' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -267,7 +274,7 @@ def test_ticket48228_test_subtree_policy(topology): topology.standalone.simple_bind_s(DN_DM, PASSWORD) try: topology.standalone.modify_s(SUBTREE_PWP, [(ldap.MOD_REPLACE, 'passwordInHistory', '4')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -297,10 +304,12 @@ def test_ticket48228_test_subtree_policy(topology): log.info("Subtree level policy was successfully verified.") + def test_ticket48228_final(topology): topology.standalone.delete() log.info('Testcase PASSED') + def run_isolated(): ''' run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) diff --git a/dirsrvtests/tickets/ticket48233_test.py b/dirsrvtests/tickets/ticket48233_test.py index 387279d..d9b0aae 100644 --- a/dirsrvtests/tickets/ticket48233_test.py +++ b/dirsrvtests/tickets/ticket48233_test.py @@ -83,7 +83,7 @@ def test_ticket48233(topology): if not entries: log.fatal('Failed return an entries from search') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False -- 389 commits mailing list 389-commits@%(host_name)s
http://lists.fedoraproject.org/postorius/389-commits@lists.fedoraproject.org
1
0
0
0
dirsrvtests/create_test.py dirsrvtests/suites dirsrvtests/tickets
by Mark Reynolds
02 Sep '15
02 Sep '15
dirsrvtests/create_test.py | 18 dirsrvtests/suites/acl/acl_test.py | 10 dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py | 14 dirsrvtests/suites/basic/basic_test.py | 60 - dirsrvtests/suites/betxns/betxn_test.py | 29 dirsrvtests/suites/config/config_test.py | 23 dirsrvtests/suites/dynamic-plugins/plugin_tests.py | 356 +++++----- dirsrvtests/suites/dynamic-plugins/stress_tests.py | 16 dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py | 14 dirsrvtests/suites/filter/filter_test.py | 10 dirsrvtests/suites/memory_leaks/range_search_test.py | 6 dirsrvtests/suites/password/password_test.py | 10 dirsrvtests/suites/password/pwdAdmin_test.py | 58 - dirsrvtests/suites/replication/cleanallruv_test.py | 100 +- dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py | 92 +- dirsrvtests/suites/schema/test_schema.py | 5 dirsrvtests/tickets/ticket365_test.py | 14 dirsrvtests/tickets/ticket47384_test.py | 16 dirsrvtests/tickets/ticket47462_test.py | 24 dirsrvtests/tickets/ticket47640_test.py | 10 dirsrvtests/tickets/ticket47653MMR_test.py | 4 dirsrvtests/tickets/ticket47669_test.py | 22 dirsrvtests/tickets/ticket47714_test.py | 12 dirsrvtests/tickets/ticket47781_test.py | 8 dirsrvtests/tickets/ticket47815_test.py | 6 dirsrvtests/tickets/ticket47819_test.py | 18 dirsrvtests/tickets/ticket47900_test.py | 40 - dirsrvtests/tickets/ticket47920_test.py | 4 dirsrvtests/tickets/ticket47921_test.py | 14 dirsrvtests/tickets/ticket47927_test.py | 47 - dirsrvtests/tickets/ticket47937_test.py | 14 dirsrvtests/tickets/ticket47950_test.py | 20 dirsrvtests/tickets/ticket47953_test.py | 4 dirsrvtests/tickets/ticket47963_test.py | 22 dirsrvtests/tickets/ticket47970_test.py | 10 dirsrvtests/tickets/ticket47973_test.py | 10 dirsrvtests/tickets/ticket47980_test.py | 88 +- dirsrvtests/tickets/ticket47981_test.py | 32 dirsrvtests/tickets/ticket48026_test.py | 6 dirsrvtests/tickets/ticket48109_test.py | 26 dirsrvtests/tickets/ticket48191_test.py | 9 dirsrvtests/tickets/ticket48214_test.py | 2 dirsrvtests/tickets/ticket48228_test.py | 35 dirsrvtests/tickets/ticket48233_test.py | 2 44 files changed, 684 insertions(+), 656 deletions(-) New commits: commit 18ae65bc31763fe0d8fbf2bc1e79ae2066e958d2 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Wed Sep 2 16:00:13 2015 -0400 Ticket 48204 - Convert all python scripts to support python3 Description: Converted all the python scripts to support both python2 and python3
https://fedorahosted.org/389/ticket/48204
Reviewed by: nhosoi(Thanks!) diff --git a/dirsrvtests/create_test.py b/dirsrvtests/create_test.py index ad9e5aa..0979f6e 100755 --- a/dirsrvtests/create_test.py +++ b/dirsrvtests/create_test.py @@ -82,38 +82,38 @@ if len(sys.argv) > 0: displayUsage() if args.ticket is None and args.suite is None: - print 'Missing required ticket number/suite name' + print('Missing required ticket number/suite name') displayUsage() if args.ticket and args.suite: - print 'You must choose either "-t|--ticket" or "-s|--suite", but not both.' + print('You must choose either "-t|--ticket" or "-s|--suite", but not both.') displayUsage() if int(args.masters) == 0: if int(args.hubs) > 0 or int(args.consumers) > 0: - print 'You must use "-m|--masters" if you want to have hubs and/or consumers' + print('You must use "-m|--masters" if you want to have hubs and/or consumers') displayUsage() if not args.masters.isdigit() or int(args.masters) > 10 or int(args.masters) < 0: - print 'Invalid value for "--masters", it must be a number and it can not be greater than 10' + print('Invalid value for "--masters", it must be a number and it can not be greater than 10') displayUsage() if not args.hubs.isdigit() or int(args.hubs) > 10 or int(args.hubs) < 0: - print 'Invalid value for "--hubs", it must be a number and it can not be greater than 10' + print('Invalid value for "--hubs", it must be a number and it can not be greater than 10') displayUsage() if not args.consumers.isdigit() or int(args.consumers) > 10 or int(args.consumers) < 0: - print 'Invalid value for "--consumers", it must be a number and it can not be greater than 10' + print('Invalid value for "--consumers", it must be a number and it can not be greater than 10') displayUsage() if args.inst: if not args.inst.isdigit() or int(args.inst) > 10 or int(args.inst) < 1: - print ('Invalid value for "--instances", it must be a number greater than 0 ' + + print('Invalid value for "--instances", it must be a number greater than 0 ' + 'and not greater than 10') displayUsage() if int(args.inst) > 0: if int(args.masters) > 0 or int(args.hubs) > 0 or int(args.consumers) > 0: - print 'You can not mix "--instances" with replication.' + print('You can not mix "--instances" with replication.') displayUsage() # Extract usable values @@ -141,7 +141,7 @@ if len(sys.argv) > 0: try: TEST = open(filename, "w") except IOError: - print "Can\'t open file:", filename + print("Can\'t open file:", filename) exit(1) # diff --git a/dirsrvtests/suites/acl/acl_test.py b/dirsrvtests/suites/acl/acl_test.py index c069a82..36aed33 100644 --- a/dirsrvtests/suites/acl/acl_test.py +++ b/dirsrvtests/suites/acl/acl_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -72,7 +72,7 @@ def add_attr(topology, attr_name): try: topology.standalone.modify_s(DN_SCHEMA, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add attr (%s): error (%s)' % (attr_name, e.message['desc'])) assert False @@ -102,7 +102,7 @@ def aci_with_attr_subtype(request, topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(DEFAULT_SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add ACI: error (%s)' % (e.message['desc'])) assert False @@ -112,7 +112,7 @@ def aci_with_attr_subtype(request, topology): mod = [(ldap.MOD_DELETE, 'aci', ACI_BODY)] try: topology.standalone.modify_s(DEFAULT_SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete ACI: error (%s)' % (e.message['desc'])) assert False request.addfinalizer(fin) @@ -142,7 +142,7 @@ def test_aci_attr_subtype_targetattr(topology, aci_with_attr_subtype): assert aci_with_attr_subtype in entry log.info(" The added attribute was found") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed, error: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py b/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py index 2e1ef33..c26a0a2 100644 --- a/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py +++ b/dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -63,7 +63,7 @@ def test_attr_uniqueness_init(topology): ''' try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False @@ -78,7 +78,7 @@ def test_attr_uniqueness(topology): topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'uid')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to configure plugin for "uid": error ' + e.message['desc']) assert False @@ -91,7 +91,7 @@ def test_attr_uniqueness(topology): 'mail': 'user1(a)example.com', 'mailAlternateAddress': 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -116,7 +116,7 @@ def test_attr_uniqueness(topology): topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -144,7 +144,7 @@ def test_attr_uniqueness(topology): [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_attr_uniqueness: Failed to reconfigure plugin for "mail mailAlternateAddress": error ' + e.message['desc']) assert False @@ -218,7 +218,7 @@ def test_attr_uniqueness(topology): # try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attr_uniqueness: Failed to delete test entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/basic/basic_test.py b/dirsrvtests/suites/basic/basic_test.py index 0c1b83b..c6ac74b 100644 --- a/dirsrvtests/suites/basic/basic_test.py +++ b/dirsrvtests/suites/basic/basic_test.py @@ -120,7 +120,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user1', 'uid': 'user1', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -131,7 +131,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user2', 'uid': 'user2', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_basic_ops(topology, import_example_ldif): 'cn': 'user3', 'uid': 'user3', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER3_DN + ': error ' + e.message['desc']) assert False @@ -152,21 +152,21 @@ def test_basic_ops(topology, import_example_ldif): try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_ADD, 'description', 'New description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add description: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'description', 'Modified description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modify description: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'description', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete description: error ' + e.message['desc']) assert False @@ -175,13 +175,13 @@ def test_basic_ops(topology, import_example_ldif): # try: topology.standalone.rename_s(USER1_DN, USER1_NEWDN, delold=1) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn user1: error ' + e.message['desc']) assert False try: topology.standalone.rename_s(USER2_DN, USER2_NEWDN, delold=0) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn user2: error ' + e.message['desc']) assert False @@ -189,7 +189,7 @@ def test_basic_ops(topology, import_example_ldif): try: topology.standalone.rename_s(USER3_DN, USER3_NEWDN, newsuperior=NEW_SUPERIOR, delold=1) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modrdn(new superior) user3: error ' + e.message['desc']) assert False @@ -198,19 +198,19 @@ def test_basic_ops(topology, import_example_ldif): # try: topology.standalone.delete_s(USER1_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry1: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER2_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry2: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER3_RDN_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test entry3: ' + e.message['desc']) assert False @@ -340,7 +340,7 @@ def test_basic_acl(topology, import_example_ldif): 'cn': 'user 1', 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -352,7 +352,7 @@ def test_basic_acl(topology, import_example_ldif): 'cn': 'user 2', 'uid': 'user2', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -363,7 +363,7 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_ADD, 'aci', DENY_ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to add DENY ACI: error ' + e.message['desc']) assert False @@ -372,7 +372,7 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as user1, error: ' + e.message['desc']) assert False @@ -383,14 +383,14 @@ def test_basic_acl(topology, import_example_ldif): if entries: log.fatal('test_basic_acl: User1 was incorrectly able to search the suffix!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search suffix failed(as user1): ' + e.message['desc']) assert False # Now try user2... Also check that userpassword is stripped out try: topology.standalone.simple_bind_s(USER2_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as user2, error: ' + e.message['desc']) assert False @@ -405,7 +405,7 @@ def test_basic_acl(topology, import_example_ldif): # The default anonymous access aci should have stripped out userpassword log.fatal('test_basic_acl: User2 was incorrectly able to see userpassword') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search for user1 failed(as user2): ' + e.message['desc']) assert False @@ -413,7 +413,7 @@ def test_basic_acl(topology, import_example_ldif): # Root DN for future operations) try: topology.standalone.simple_bind_s(DN_DM, PW_DM) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to bind as ROotDN, error: ' + e.message['desc']) assert False @@ -424,7 +424,7 @@ def test_basic_acl(topology, import_example_ldif): if not entries: log.fatal('test_basic_acl: Root DN incorrectly not able to search the suffix') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Search for user1 failed(as user2): ' + e.message['desc']) assert False @@ -433,19 +433,19 @@ def test_basic_acl(topology, import_example_ldif): # try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_DELETE, 'aci', DENY_ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete DENY ACI: error ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete test entry1: ' + e.message['desc']) assert False try: topology.standalone.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_acl: Failed to delete test entry2: ' + e.message['desc']) assert False @@ -484,7 +484,7 @@ def test_basic_searches(topology, import_example_ldif): was returned from filter (%s): (%d) expected (%d)' % (search_filter, len(entries), search_result)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -508,14 +508,14 @@ def test_basic_referrals(topology, import_example_ldif): [(ldap.MOD_REPLACE, 'nsslapd-referral', 'ldap://localhost.localdomain:389/o%3dnetscaperoot')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set referral: error ' + e.message['desc']) assert False try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-state', 'Referral')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set backend state: error ' + e.message['desc']) assert False @@ -528,7 +528,7 @@ def test_basic_referrals(topology, import_example_ldif): topology.standalone.search_s(DEFAULT_SUFFIX, ldap.SCOPE_SUBTREE, 'objectclass=top') except ldap.REFERRAL: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Search failed: ' + e.message['desc']) assert False @@ -543,7 +543,7 @@ def test_basic_referrals(topology, import_example_ldif): try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-state', 'Backend')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to set backend state: error ' + e.message['desc']) assert False @@ -551,7 +551,7 @@ def test_basic_referrals(topology, import_example_ldif): try: topology.standalone.modify_s(SUFFIX_CONFIG, [(ldap.MOD_DELETE, 'nsslapd-referral', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_basic_referrals: Failed to delete referral: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/betxns/betxn_test.py b/dirsrvtests/suites/betxns/betxn_test.py index 5da6e50..7bef791 100644 --- a/dirsrvtests/suites/betxns/betxn_test.py +++ b/dirsrvtests/suites/betxns/betxn_test.py @@ -12,6 +12,7 @@ import time import ldap import logging import pytest +import six from lib389 import DirSrv, Entry, tools, tasks from lib389.tools import DirSrvTools from lib389._constants import * @@ -60,7 +61,7 @@ def test_betxn_init(topology): # First enable dynamic plugins - makes plugin testing much easier try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.error('Failed to enable dynamic plugin!' + e.message['desc']) assert False @@ -73,7 +74,7 @@ def test_betxt_7bit(topology): log.info('Running test_betxt_7bit...') USER_DN = 'uid=test_entry,' + DEFAULT_SUFFIX - eight_bit_rdn = u'uid=Fu\u00c4\u00e8' + eight_bit_rdn = six.u('uid=Fu\u00c4\u00e8') BAD_RDN = eight_bit_rdn.encode('utf-8') # This plugin should on by default, but just in case... @@ -86,7 +87,7 @@ def test_betxt_7bit(topology): 'cn': 'test 1', 'uid': 'test_entry', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user' + USER_DN + ': error ' + e.message['desc']) assert False @@ -95,7 +96,7 @@ def test_betxt_7bit(topology): topology.standalone.rename_s(USER_DN, BAD_RDN, delold=0) log.fatal('test_betxt_7bit: Modrdn operation incorrectly succeeded') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('Modrdn failed as expected: error ' + e.message['desc']) # Make sure the operation did not succeed, attempt to search for the new RDN @@ -104,7 +105,7 @@ def test_betxt_7bit(topology): if entries: log.fatal('test_betxt_7bit: Incorrectly found the entry using the invalid RDN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Error whiles earching for test entry: ' + e.message['desc']) assert False @@ -113,7 +114,7 @@ def test_betxt_7bit(topology): # try: topology.standalone.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete test entry: ' + e.message['desc']) assert False @@ -140,7 +141,7 @@ def test_betxn_attr_uniqueness(topology): 'cn': 'test 1', 'uid': 'test_entry1', 'userpassword': 'password1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_attr_uniqueness: Failed to add test user: ' + USER1_DN + ', error ' + e.message['desc']) assert False @@ -155,7 +156,7 @@ def test_betxn_attr_uniqueness(topology): 'userpassword': 'password2'}))) log.fatal('test_betxn_attr_uniqueness: The second entry was incorrectly added.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_attr_uniqueness: Failed to add test user as expected: ' + USER1_DN + ', error ' + e.message['desc']) @@ -166,7 +167,7 @@ def test_betxn_attr_uniqueness(topology): try: topology.standalone.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_attr_uniqueness: Failed to delete test entry1: ' + e.message['desc']) assert False @@ -183,7 +184,7 @@ def test_betxn_memberof(topology): topology.standalone.plugins.enable(name=PLUGIN_MEMBER_OF) try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_betxn_memberof: Failed to update config(member): error ' + e.message['desc']) assert False @@ -191,7 +192,7 @@ def test_betxn_memberof(topology): try: topology.standalone.add_s(Entry((ENTRY1_DN, {'objectclass': "top groupofnames".split(), 'cn': 'group1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_memberof: Failed to add group1:' + ENTRY1_DN + ', error ' + e.message['desc']) assert False @@ -199,7 +200,7 @@ def test_betxn_memberof(topology): try: topology.standalone.add_s(Entry((ENTRY2_DN, {'objectclass': "top groupofnames".split(), 'cn': 'group1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_betxn_memberof: Failed to add group2:' + ENTRY2_DN + ', error ' + e.message['desc']) assert False @@ -213,7 +214,7 @@ def test_betxn_memberof(topology): topology.standalone.modify_s(ENTRY1_DN, [(ldap.MOD_REPLACE, 'member', ENTRY2_DN)]) log.fatal('test_betxn_memberof: Group2 was incorrectly allowed to be added to group1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_betxn_memberof: Group2 was correctly rejected (mod replace): error ' + e.message['desc']) # @@ -225,7 +226,7 @@ def test_betxn_memberof(topology): topology.standalone.modify_s(ENTRY1_DN, [(ldap.MOD_ADD, 'member', ENTRY2_DN)]) log.fatal('test_betxn_memberof: Group2 was incorrectly allowed to be added to group1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_betxn_memberof: Group2 was correctly rejected (mod add): error ' + e.message['desc']) # diff --git a/dirsrvtests/suites/config/config_test.py b/dirsrvtests/suites/config/config_test.py index 43070ce..d3631e3 100644 --- a/dirsrvtests/suites/config/config_test.py +++ b/dirsrvtests/suites/config/config_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -79,27 +79,28 @@ def test_config_listen_backport_size(topology): if not default_val: log.fatal('test_config_listen_backport_size: Failed to get nsslapd-listen-backlog-size from config') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to search config, error: ' + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', '256')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to modify config, error: ' + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', '-1')]) - except ldap.LDAPError, e: - log.fatal('test_config_listen_backport_size: Failed to modify config(negative value), error: ' + e.message('desc')) + except ldap.LDAPError as e: + log.fatal('test_config_listen_backport_size: Failed to modify config(negative value), error: ' + + e.message('desc')) assert False try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', 'ZZ')]) log.fatal('test_config_listen_backport_size: Invalid value was successfully added') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: pass # @@ -107,7 +108,7 @@ def test_config_listen_backport_size(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-listen-backlog-size', default_val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_listen_backport_size: Failed to reset config, error: ' + e.message('desc')) assert False @@ -136,7 +137,7 @@ def test_config_deadlock_policy(topology): log.fatal('test_config_deadlock_policy: The wrong derfualt value was present: (%s) but expected (%s)' % (val, default_val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to search config, error: ' + e.message('desc')) assert False @@ -144,7 +145,7 @@ def test_config_deadlock_policy(topology): for val in ('0', '5', '9'): try: topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to modify config: nsslapd-db-deadlock-policy to (%s), error: %s' % (val, e.message('desc'))) assert False @@ -155,14 +156,14 @@ def test_config_deadlock_policy(topology): topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', val)]) log.fatal('test_config_deadlock_policy: Able to add invalid value to nsslapd-db-deadlock-policy(%s)' % (val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: pass # # Cleanup - undo what we've done # try: topology.standalone.modify_s(LDBM_DN, [(ldap.MOD_REPLACE, 'nsslapd-db-deadlock-policy', default_val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_config_deadlock_policy: Failed to reset nsslapd-db-deadlock-policy to the default value(%s), error: %s' % (default_val, e.message('desc'))) diff --git a/dirsrvtests/suites/dynamic-plugins/plugin_tests.py b/dirsrvtests/suites/dynamic-plugins/plugin_tests.py index 1b5f63d..30dfa88 100644 --- a/dirsrvtests/suites/dynamic-plugins/plugin_tests.py +++ b/dirsrvtests/suites/dynamic-plugins/plugin_tests.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -64,7 +64,7 @@ def test_dependency(inst, plugin): inst.modify_s('cn=' + PLUGIN_ACCT_USABILITY + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'nsslapd-plugin-depends-on-named', plugin)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dependency: Failed to modify ' + PLUGIN_ACCT_USABILITY + ': error ' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_dependency(inst, plugin): try: inst.modify_s('cn=' + PLUGIN_ACCT_USABILITY + ',cn=plugins,cn=config', [(ldap.MOD_DELETE, 'nsslapd-plugin-depends-on-named', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dependency: Failed to reset ' + plugin + ': error ' + e.message['desc']) assert False @@ -107,7 +107,7 @@ def wait_for_task(conn, task_dn): # task is done finished = True break - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('wait_for_task: Search failed: ' + e.message['desc']) assert False @@ -152,10 +152,10 @@ def test_acctpolicy(inst, args=None): inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'alwaysrecordlogin', 'yes'), (ldap.MOD_REPLACE, 'stateattrname', 'lastLoginTime')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to modify config entry: error ' + e.message['desc']) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to add config entry: error ' + e.message['desc']) assert False @@ -171,14 +171,14 @@ def test_acctpolicy(inst, args=None): 'cn': 'user 1', 'uid': 'user1', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False # bind as user try: inst.simple_bind_s(USER1_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as user1: ' + e.message['desc']) assert False @@ -186,7 +186,7 @@ def test_acctpolicy(inst, args=None): time.sleep(1) try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -196,7 +196,7 @@ def test_acctpolicy(inst, args=None): if not entries: log.fatal('test_acctpolicy: Search failed to find an entry with lastLoginTime.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Search failed: ' + e.message['desc']) assert False @@ -207,7 +207,7 @@ def test_acctpolicy(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'stateattrname', 'testLastLoginTime')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -219,7 +219,7 @@ def test_acctpolicy(inst, args=None): # login as user try: inst.simple_bind_s(USER1_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind(2nd) as user1: ' + e.message['desc']) assert False @@ -227,7 +227,7 @@ def test_acctpolicy(inst, args=None): # Bind as Root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -237,7 +237,7 @@ def test_acctpolicy(inst, args=None): if not entries: log.fatal('test_acctpolicy: Search failed to find an entry with testLastLoginTime.') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Search failed: ' + e.message['desc']) assert False @@ -253,7 +253,7 @@ def test_acctpolicy(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_acctpolicy: Failed to delete test entry: ' + e.message['desc']) assert False @@ -289,7 +289,7 @@ def test_attruniq(inst, args=None): inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'uid')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to configure plugin for "uid": error ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_attruniq(inst, args=None): 'mail': 'user1(a)example.com', 'mailAlternateAddress' : 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -333,7 +333,7 @@ def test_attruniq(inst, args=None): inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -360,11 +360,11 @@ def test_attruniq(inst, args=None): try: inst.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', - [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), + [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'mail'), (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_attruniq: Failed to reconfigure plugin for "mail mailAlternateAddress": error ' + e.message['desc']) assert False @@ -448,7 +448,7 @@ def test_attruniq(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_attruniq: Failed to delete test entry: ' + e.message['desc']) assert False @@ -487,7 +487,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'cn': 'group' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add group: error ' + e.message['desc']) assert False @@ -497,7 +497,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'ou': 'branch1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add branch1: error ' + e.message['desc']) assert False @@ -507,7 +507,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'ou': 'branch2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add branch2: error ' + e.message['desc']) assert False @@ -521,7 +521,7 @@ def test_automember(inst, args=None): 'autoMemberDefaultGroup': 'cn=group,' + DEFAULT_SUFFIX, 'autoMemberGroupingAttr': 'member:dn' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add config entry: error ' + e.message['desc']) assert False @@ -535,7 +535,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add user: error ' + e.message['desc']) assert False @@ -546,7 +546,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: Search failed to find member user1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -559,7 +559,7 @@ def test_automember(inst, args=None): [(ldap.MOD_REPLACE, 'autoMemberGroupingAttr', 'uniquemember:dn'), (ldap.MOD_REPLACE, 'autoMemberScope', 'ou=branch2,' + DEFAULT_SUFFIX)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -573,7 +573,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to user to branch2: error ' + e.message['desc']) assert False @@ -584,7 +584,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: Search failed to find uniquemember user2') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -601,7 +601,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to user3 to branch2: error ' + e.message['desc']) assert False @@ -612,7 +612,7 @@ def test_automember(inst, args=None): if entries: log.fatal('test_automember: user3 was incorrectly added to the group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -626,7 +626,7 @@ def test_automember(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': 'ou=branch2,' + DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to add task: error ' + e.message['desc']) assert False @@ -639,7 +639,7 @@ def test_automember(inst, args=None): if not entries: log.fatal('test_automember: user3 was not added to the group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Search failed: ' + e.message['desc']) assert False @@ -655,43 +655,43 @@ def test_automember(inst, args=None): try: inst.delete_s(BUSER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(BUSER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry2: ' + e.message['desc']) assert False try: inst.delete_s(BUSER3_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test entry3: ' + e.message['desc']) assert False try: inst.delete_s(BRANCH1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete branch1: ' + e.message['desc']) assert False try: inst.delete_s(BRANCH2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test branch2: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete test group: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_automember: Failed to delete plugin config entry: ' + e.message['desc']) assert False @@ -739,10 +739,10 @@ def test_dna(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaNextValue', '1'), (ldap.MOD_REPLACE, 'dnaMagicRegen', '-1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the DNA plugin: error ' + e.message['desc']) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to add config entry: error ' + e.message['desc']) assert False @@ -755,7 +755,7 @@ def test_dna(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to user1: error ' + e.message['desc']) assert False @@ -765,14 +765,14 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated - (looking for uidNumber: 1)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False # Test the magic regen value try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', '-1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc']) assert False @@ -782,7 +782,7 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated (looking for uidNumber: 2)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False @@ -792,7 +792,7 @@ def test_dna(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaMagicRegen', '-2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value to -2: error ' + e.message['desc']) assert False @@ -803,7 +803,7 @@ def test_dna(inst, args=None): # Test the magic regen value try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', '-2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc']) assert False @@ -813,7 +813,7 @@ def test_dna(inst, args=None): if not entries: log.fatal('test_dna: user1 was not updated (looking for uidNumber: 3)') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Search for user1 failed: ' + e.message['desc']) assert False @@ -829,7 +829,7 @@ def test_dna(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_dna: Failed to delete test entry1: ' + e.message['desc']) assert False @@ -871,7 +871,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to user1: error ' + e.message['desc']) assert False @@ -880,7 +880,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to user1: error ' + e.message['desc']) assert False @@ -892,7 +892,7 @@ def test_linkedattrs(inst, args=None): 'linkType': 'directReport', 'managedType': 'manager' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add config entry: error ' + e.message['desc']) assert False @@ -903,7 +903,7 @@ def test_linkedattrs(inst, args=None): # Set "directReport" should add "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'directReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "directReport" to user1: error ' + e.message['desc']) assert False @@ -913,14 +913,14 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: user2 missing "manager" attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False # Remove "directReport" should remove "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'directReport', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete directReport: error ' + e.message['desc']) assert False @@ -930,7 +930,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 "manager" attribute not removed') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -940,7 +940,7 @@ def test_linkedattrs(inst, args=None): try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'linkType', 'indirectReport')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_linkedattrs: Failed to set linkTypee: error ' + e.message['desc']) assert False @@ -951,7 +951,7 @@ def test_linkedattrs(inst, args=None): # Make sure the old linkType(directManager) is not working try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'directReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "directReport" to user1: error ' + e.message['desc']) assert False @@ -961,14 +961,14 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 had "manager" added unexpectedly') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user2 failed: ' + e.message['desc']) assert False # Now, set the new linkType "indirectReport", which should add "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'indirectReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "indirectReport" to user1: error ' + e.message['desc']) assert False @@ -978,14 +978,14 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: user2 missing "manager"') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user2 failed: ' + e.message['desc']) assert False # Remove "indirectReport" should remove "manager" to the other entry try: inst.modify_s(USER1_DN, [(ldap.MOD_DELETE, 'indirectReport', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete directReport: error ' + e.message['desc']) assert False @@ -995,7 +995,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 "manager" attribute not removed') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1008,7 +1008,7 @@ def test_linkedattrs(inst, args=None): try: inst.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'indirectReport', USER2_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add "indirectReport" to user1: error ' + e.message['desc']) assert False @@ -1018,7 +1018,7 @@ def test_linkedattrs(inst, args=None): if entries: log.fatal('test_linkedattrs: user2 incorrectly has a "manager" attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1032,7 +1032,7 @@ def test_linkedattrs(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to add task: error ' + e.message['desc']) assert False @@ -1044,7 +1044,7 @@ def test_linkedattrs(inst, args=None): if not entries: log.fatal('test_linkedattrs: task failed: user2 missing "manager" attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Search for user1 failed: ' + e.message['desc']) assert False @@ -1060,19 +1060,19 @@ def test_linkedattrs(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete test entry2: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_linkedattrs: Failed to delete plugin config entry: ' + e.message['desc']) assert False @@ -1108,7 +1108,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(member): error ' + e.message['desc']) assert False @@ -1122,7 +1122,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add user1: error ' + e.message['desc']) assert False @@ -1132,7 +1132,7 @@ def test_memberof(inst, args=None): 'cn': 'group', 'member': USER1_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add group: error ' + e.message['desc']) assert False @@ -1142,7 +1142,7 @@ def test_memberof(inst, args=None): 'memberofgroupattr': 'member', 'memberofattr': 'memberof' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to shared config entry: error ' + e.message['desc']) assert False @@ -1152,14 +1152,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "member" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1169,7 +1169,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1179,7 +1179,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False @@ -1189,7 +1189,7 @@ def test_memberof(inst, args=None): try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1199,14 +1199,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'uniquemember', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1216,7 +1216,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1227,20 +1227,20 @@ def test_memberof(inst, args=None): # The shared config entry uses "member" - the above test uses "uniquemember" try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, CONFIG_AREA, SHARED_CONFIG_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to set plugin area: error ' + e.message['desc']) assert False # Delete the test entries then readd them to start with a clean slate try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test group: ' + e.message['desc']) assert False @@ -1249,7 +1249,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add user1: error ' + e.message['desc']) assert False @@ -1259,7 +1259,7 @@ def test_memberof(inst, args=None): 'cn': 'group', 'member': USER1_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add group: error ' + e.message['desc']) assert False @@ -1270,14 +1270,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "member" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1287,7 +1287,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1297,14 +1297,14 @@ def test_memberof(inst, args=None): try: inst.modify_s(SHARED_CONFIG_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to set shared plugin entry(uniquemember): error ' + e.message['desc']) assert False try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1314,14 +1314,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'uniquemember', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1331,7 +1331,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1342,20 +1342,20 @@ def test_memberof(inst, args=None): # First change the plugin to use member before we move the shared config that uses uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Remove shared config from plugin try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, CONFIG_AREA, None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'member', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1365,14 +1365,14 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False # Remove "uniquemember" should remove "memberOf" from the entry try: inst.modify_s(GROUP_DN, [(ldap.MOD_DELETE, 'member', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete member: error ' + e.message['desc']) assert False @@ -1382,7 +1382,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrectly has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1395,14 +1395,14 @@ def test_memberof(inst, args=None): # First change the plugin to use uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Add uniquemember, should not update USER1 try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'uniquemember', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -1412,7 +1412,7 @@ def test_memberof(inst, args=None): if entries: log.fatal('test_memberof: user1 incorrect has memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1425,7 +1425,7 @@ def test_memberof(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'basedn': DEFAULT_SUFFIX, 'filter': 'objectclass=top'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to add task: error ' + e.message['desc']) assert False @@ -1437,7 +1437,7 @@ def test_memberof(inst, args=None): if not entries: log.fatal('test_memberof: user1 missing memberOf attr') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Search for user1 failed: ' + e.message['desc']) assert False @@ -1453,19 +1453,19 @@ def test_memberof(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test entry1: ' + e.message['desc']) assert False try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete test group: ' + e.message['desc']) assert False try: inst.delete_s(SHARED_CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_memberof: Failed to delete shared config entry: ' + e.message['desc']) assert False @@ -1512,7 +1512,7 @@ def test_mep(inst, args=None): 'ou': 'people'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add people org unit: error ' + e.message['desc']) assert False @@ -1522,7 +1522,7 @@ def test_mep(inst, args=None): 'ou': 'people'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add people org unit: error ' + e.message['desc']) assert False @@ -1535,7 +1535,7 @@ def test_mep(inst, args=None): 'mepStaticAttr': 'objectclass: posixGroup|objectclass: extensibleObject'.split('|'), 'mepMappedAttr': 'cn: $cn|uid: $cn|gidNumber: $uidNumber'.split('|') }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add template entry: error ' + e.message['desc']) assert False @@ -1549,7 +1549,7 @@ def test_mep(inst, args=None): 'managedBase': GROUP_OU, 'managedTemplate': TEMPLATE_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add config entry: error ' + e.message['desc']) assert False @@ -1567,14 +1567,14 @@ def test_mep(inst, args=None): 'gidNumber': '1', 'homeDirectory': '/home/user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to user1: error ' + e.message['desc']) assert False # Check if a managed group entry was created try: inst.search_s(MEP_USER_DN, ldap.SCOPE_BASE, '(objectclass=top)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Unable to find MEP entry: ' + e.message['desc']) assert False @@ -1591,14 +1591,14 @@ def test_mep(inst, args=None): 'mepStaticAttr': 'objectclass: posixGroup|objectclass: extensibleObject'.split('|'), 'mepMappedAttr': 'cn: $uid|uid: $cn|gidNumber: $gidNumber'.split('|') }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to add template entry2: error ' + e.message['desc']) assert False # Set the new template dn try: inst.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'managedTemplate', TEMPLATE_DN2)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to set mep plugin config: error ' + e.message['desc']) assert False @@ -1616,14 +1616,14 @@ def test_mep(inst, args=None): 'gidNumber': '1', 'homeDirectory': '/home/user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to user2: error ' + e.message['desc']) assert False # Check if a managed group entry was created try: inst.search_s(MEP_USER_DN2, ldap.SCOPE_BASE, '(objectclass=top)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Unable to find MEP entry2: ' + e.message['desc']) assert False @@ -1639,19 +1639,19 @@ def test_mep(inst, args=None): try: inst.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete test user1: ' + e.message['desc']) assert False try: inst.delete_s(USER_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete test user 2: ' + e.message['desc']) assert False try: inst.delete_s(TEMPLATE_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete template1: ' + e.message['desc']) assert False @@ -1659,13 +1659,13 @@ def test_mep(inst, args=None): try: inst.delete_s(TEMPLATE_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete template2: ' + e.message['desc']) assert False try: inst.delete_s(CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_mep: Failed to delete config: ' + e.message['desc']) assert False @@ -1727,7 +1727,7 @@ def test_passthru(inst, args=None): 'dc': 'pass2'}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to create suffix entry: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1739,7 +1739,7 @@ def test_passthru(inst, args=None): 'uid': 'admin', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to admin1: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1751,7 +1751,7 @@ def test_passthru(inst, args=None): 'uid': 'admin2', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to admin2 : error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1763,7 +1763,7 @@ def test_passthru(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginenabled', 'on'), (ldap.MOD_REPLACE, 'nsslapd-pluginarg0', 'ldap://127.0.0.1:33333/dc=pass,dc=thru')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to set mep plugin config: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1775,7 +1775,7 @@ def test_passthru(inst, args=None): # login as user try: inst.simple_bind_s(PASSTHRU_DN, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1787,14 +1787,14 @@ def test_passthru(inst, args=None): # login as root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginarg0', 'ldap://127.0.0.1:33333/dc=pass2,dc=thru')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: Failed to set mep plugin config: error ' + e.message['desc']) passthru_inst.delete() assert False @@ -1806,7 +1806,7 @@ def test_passthru(inst, args=None): # login as user try: inst.simple_bind_s(PASSTHRU_DN2, "password") - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1814,7 +1814,7 @@ def test_passthru(inst, args=None): # login as root DN try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_passthru: pass through bind failed: ' + e.message['desc']) passthru_inst.delete() assert False @@ -1864,7 +1864,7 @@ def test_referint(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -1878,7 +1878,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False @@ -1887,7 +1887,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user2: error ' + e.message['desc']) assert False @@ -1898,7 +1898,7 @@ def test_referint(inst, args=None): 'member': USER1_DN, 'uniquemember': USER2_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add group: error ' + e.message['desc']) assert False @@ -1907,7 +1907,7 @@ def test_referint(inst, args=None): try: entries = inst.search_s(PLUGIN_DN, ldap.SCOPE_BASE, '(objectclass=top)') REFERINT_LOGFILE = entries[0].getValue('referint-logfile') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search plugin entry: ' + e.message['desc']) assert False @@ -1920,14 +1920,14 @@ def test_referint(inst, args=None): 'referint-logfile': REFERINT_LOGFILE, 'referint-logchanges': '0' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to shared config entry: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -1937,7 +1937,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -1947,7 +1947,7 @@ def test_referint(inst, args=None): try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -1958,7 +1958,7 @@ def test_referint(inst, args=None): # Delete a user try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -1968,7 +1968,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user2 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -1979,14 +1979,14 @@ def test_referint(inst, args=None): # The shared config entry uses "member" - the above test used "uniquemember" try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, CONFIG_AREA, SHARED_CONFIG_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to set plugin area: error ' + e.message['desc']) assert False # Delete the group, and readd everything try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete group: ' + e.message['desc']) assert False @@ -1995,7 +1995,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False @@ -2004,7 +2004,7 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user2: error ' + e.message['desc']) assert False @@ -2015,14 +2015,14 @@ def test_referint(inst, args=None): 'member': USER1_DN, 'uniquemember': USER2_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add group: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2032,7 +2032,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2042,7 +2042,7 @@ def test_referint(inst, args=None): try: inst.modify_s(SHARED_CONFIG_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to set shared plugin entry(uniquemember): error ' + e.message['desc']) assert False @@ -2050,7 +2050,7 @@ def test_referint(inst, args=None): # Delete a user try: inst.delete_s(USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2060,7 +2060,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user2 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2071,14 +2071,14 @@ def test_referint(inst, args=None): # First change the plugin to use member before we move the shared config that uses uniquemember try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'member')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to update config(uniquemember): error ' + e.message['desc']) assert False # Remove shared config from plugin try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, CONFIG_AREA, None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add uniquemember: error ' + e.message['desc']) assert False @@ -2088,21 +2088,21 @@ def test_referint(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add user1: error ' + e.message['desc']) assert False # Add user to group try: inst.modify_s(GROUP_DN, [(ldap.MOD_REPLACE, 'member', USER1_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to add uniquemember: error ' + e.message['desc']) assert False # Delete a user try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete user1: ' + e.message['desc']) assert False @@ -2112,7 +2112,7 @@ def test_referint(inst, args=None): if entry: log.fatal('test_referint: user1 was not removed from group') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Unable to search group: ' + e.message['desc']) assert False @@ -2128,13 +2128,13 @@ def test_referint(inst, args=None): try: inst.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete group: ' + e.message['desc']) assert False try: inst.delete_s(SHARED_CONFIG_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_referint: Failed to delete shared config entry: ' + e.message['desc']) assert False @@ -2169,7 +2169,7 @@ def test_retrocl(inst, args=None): # Gather the current change count (it's not 1 once we start the stabilty tests) try: entry = inst.search_s(RETROCL_SUFFIX, ldap.SCOPE_SUBTREE, '(changenumber=*)') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to get the count: error ' + e.message['desc']) assert False @@ -2185,7 +2185,7 @@ def test_retrocl(inst, args=None): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to add user1: error ' + e.message['desc']) assert False @@ -2195,7 +2195,7 @@ def test_retrocl(inst, args=None): if not entry or len(entry) == entry_count: log.fatal('test_retrocl: changelog not updated') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Unable to search group: ' + e.message['desc']) assert False @@ -2213,7 +2213,7 @@ def test_retrocl(inst, args=None): try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Failed to delete user1: ' + e.message['desc']) assert False @@ -2224,7 +2224,7 @@ def test_retrocl(inst, args=None): log.fatal('test_retrocl: changelog incorrectly updated - change count: ' + str(len(entry)) + ' - expected 1') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_retrocl: Unable to search retro changelog: ' + e.message['desc']) assert False @@ -2278,7 +2278,7 @@ def test_rootdn(inst, args=None): 'uid': 'user1', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add user1: error ' + e.message['desc']) assert False @@ -2287,14 +2287,14 @@ def test_rootdn(inst, args=None): '"all access";allow (all)(userdn="ldap:///anyone");)') try: inst.modify_s(DN_CONFIG, [(ldap.MOD_ADD, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add aci to config: error ' + e.message['desc']) assert False # Set allowed IP to an unknown host - blocks root dn try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '10.10.10.10')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -2306,7 +2306,7 @@ def test_rootdn(inst, args=None): failed = False try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: failed = True if not failed: @@ -2320,7 +2320,7 @@ def test_rootdn(inst, args=None): # Bind as the user who can make updates to the config try: inst.simple_bind_s(USER1_DN, 'password') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: failed to bind as user1') assert False @@ -2342,7 +2342,7 @@ def test_rootdn(inst, args=None): # Remove the restriction try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -2354,7 +2354,7 @@ def test_rootdn(inst, args=None): failed = False try: inst.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: failed = True if failed: @@ -2373,13 +2373,13 @@ def test_rootdn(inst, args=None): try: inst.modify_s(DN_CONFIG, [(ldap.MOD_DELETE, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to add aci to config: error ' + e.message['desc']) assert False try: inst.delete_s(USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn: Failed to delete user1: ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/dynamic-plugins/stress_tests.py b/dirsrvtests/suites/dynamic-plugins/stress_tests.py index 72c1f3e..920d3f6 100644 --- a/dirsrvtests/suites/dynamic-plugins/stress_tests.py +++ b/dirsrvtests/suites/dynamic-plugins/stress_tests.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -48,7 +48,7 @@ def configureRI(inst): PLUGIN_DN = 'cn=' + PLUGIN_REFER_INTEGRITY + ',cn=plugins,cn=config' try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'referint-membership-attr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('configureRI: Failed to configure RI plugin: error ' + e.message['desc']) assert False @@ -59,7 +59,7 @@ def configureMO(inst): PLUGIN_DN = 'cn=' + PLUGIN_MEMBER_OF + ',cn=plugins,cn=config' try: inst.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofgroupattr', 'uniquemember')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('configureMO: Failed to update config(uniquemember): error ' + e.message['desc']) assert False @@ -67,7 +67,7 @@ def configureMO(inst): def cleanup(conn): try: conn.delete_s(GROUP_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('cleanup: failed to delete group (' + GROUP_DN + ') error: ' + e.message['desc']) assert False @@ -87,7 +87,7 @@ class DelUsers(threading.Thread): USER_DN = 'uid=' + self.rdnval + str(idx) + ',' + DEFAULT_SUFFIX try: conn.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('DeleteUsers: failed to delete (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -117,7 +117,7 @@ class AddUsers(threading.Thread): 'uid': 'user' + str(idx)}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: failed to add group (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -128,7 +128,7 @@ class AddUsers(threading.Thread): try: conn.add_s(Entry((USER_DN, {'objectclass': 'top extensibleObject'.split(), 'uid': 'user' + str(idx)}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: failed to add (' + USER_DN + ') error: ' + e.message['desc']) assert False @@ -136,7 +136,7 @@ class AddUsers(threading.Thread): # Add the user to the group try: conn.modify_s(GROUP_DN, [(ldap.MOD_ADD, 'uniquemember', USER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('AddUsers: Failed to add user' + USER_DN + ' to group: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py b/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py index f2cad88..c05c402 100644 --- a/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py +++ b/dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -115,14 +115,14 @@ def test_dynamic_plugins(topology): # First enable dynamic plugins try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False # Test that critical plugins can be updated even though the change might not be applied try: topology.standalone.modify_s(DN_LDBM, [(ldap.MOD_REPLACE, 'description', 'test')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to apply change to critical plugin' + e.message['desc']) assert False @@ -380,7 +380,7 @@ def test_dynamic_plugins(topology): log.error('Failed to find maxcsn on master') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search masterfor db tombstone: ' + e.message['desc']) repl_fail(replica_inst) @@ -404,7 +404,7 @@ def test_dynamic_plugins(topology): if replica_maxcsn == 0: log.error('Failed to find maxcsn on consumer') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for db tombstone on consumer: ' + e.message['desc']) repl_fail(replica_inst) @@ -433,7 +433,7 @@ def test_dynamic_plugins(topology): if len(entries) > 0: log.error('Master database has incorrect data set!\n') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search db on master: ' + e.message['desc']) repl_fail(replica_inst) @@ -445,7 +445,7 @@ def test_dynamic_plugins(topology): if len(entries) > 0: log.error('Consumer database in not consistent with master database') repl_fail(replica_inst) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search db on consumer: ' + e.message['desc']) repl_fail(replica_inst) diff --git a/dirsrvtests/suites/filter/filter_test.py b/dirsrvtests/suites/filter/filter_test.py index 5e7fa34..d212f6a 100644 --- a/dirsrvtests/suites/filter/filter_test.py +++ b/dirsrvtests/suites/filter/filter_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -79,7 +79,7 @@ def test_filter_escaped(topology): 'cn': 'test * me', 'uid': 'test_entry', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -90,7 +90,7 @@ def test_filter_escaped(topology): 'cn': 'test me', 'uid': 'test_entry2', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to add test user ' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_filter_escaped(topology): if not entry or len(entry) > 1: log.fatal('test_filter_escaped: Entry was not found using "cn=*\**"') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_escaped: Failed to search for user(%s), error: %s' % (USER1_DN, e.message('desc'))) assert False @@ -121,7 +121,7 @@ def test_filter_search_original_attrs(topology): if entry[0].hasAttr('objectclass-EXTRA'): log.fatal('test_filter_search_original_attrs: Entry does not have the original attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_filter_search_original_attrs: Failed to search suffix(%s), error: %s' % (DEFAULT_SUFFIX, e.message('desc'))) assert False diff --git a/dirsrvtests/suites/memory_leaks/range_search_test.py b/dirsrvtests/suites/memory_leaks/range_search_test.py index 7d9d14f..21369b9 100644 --- a/dirsrvtests/suites/memory_leaks/range_search_test.py +++ b/dirsrvtests/suites/memory_leaks/range_search_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -100,7 +100,7 @@ def test_range_search(topology): try: topology.standalone.add_s(Entry((USER_DN, {'objectclass': "top extensibleObject".split(), 'uid': 'user' + idx}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_range_search: Failed to add test user ' + USER_DN + ': error ' + e.message['desc']) success = False time.sleep(1) @@ -110,7 +110,7 @@ def test_range_search(topology): try: topology.standalone.search_s(RETROCL_SUFFIX, ldap.SCOPE_SUBTREE, '(&(changenumber>=74)(changenumber<=84))') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_range_search: Failed to search retro changelog(%s), error: %s' % (RETROCL_SUFFIX, e.message('desc'))) test_range_search_final(topology) # With valgrind we always need to cleanup diff --git a/dirsrvtests/suites/password/password_test.py b/dirsrvtests/suites/password/password_test.py index f21d051..3465c2c 100644 --- a/dirsrvtests/suites/password/password_test.py +++ b/dirsrvtests/suites/password/password_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -82,7 +82,7 @@ def test_password_delete_specific_password(topology): 'cn': 'user 1', 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to add test user ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -92,7 +92,7 @@ def test_password_delete_specific_password(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_DELETE, 'userpassword', PASSWORD)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to delete userpassword: error ' + e.message['desc']) assert False @@ -105,7 +105,7 @@ def test_password_delete_specific_password(topology): if entry[0].hasAttr('userpassword'): log.fatal('test_password_delete_specific_password: Entry incorrectly still have the userpassword attribute') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to search for user(%s), error: %s' % (USER_DN, e.message('desc'))) assert False @@ -115,7 +115,7 @@ def test_password_delete_specific_password(topology): # try: topology.standalone.delete_s(USER_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_password_delete_specific_password: Failed to delete user(%s), error: %s' % (USER_DN, e.message('desc'))) assert False diff --git a/dirsrvtests/suites/password/pwdAdmin_test.py b/dirsrvtests/suites/password/pwdAdmin_test.py index a1edc64..2c38756 100644 --- a/dirsrvtests/suites/password/pwdAdmin_test.py +++ b/dirsrvtests/suites/password/pwdAdmin_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -80,7 +80,7 @@ def test_pwdAdmin_init(topology): topology.standalone.add_s(Entry((ADMIN_DN, {'objectclass': "top extensibleObject".split(), 'cn': ADMIN_NAME, 'userpassword': ADMIN_PWD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add test user' + ADMIN_DN + ': error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_pwdAdmin_init(topology): topology.standalone.add_s(Entry((ADMIN2_DN, {'objectclass': "top extensibleObject".split(), 'cn': ADMIN2_NAME, 'userpassword': ADMIN_PWD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add test user ' + ADMIN2_DN + ': error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_pwdAdmin_init(topology): 'cn': 'password admin group', 'uniquemember': ADMIN_DN, 'uniquemember': ADMIN2_DN}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add group' + ADMIN_GROUP_DN + ': error ' + e.message['desc']) assert False @@ -113,7 +113,7 @@ def test_pwdAdmin_init(topology): (ldap.MOD_REPLACE, 'passwordExp', 'on'), (ldap.MOD_REPLACE, 'passwordMinDigits', '1'), (ldap.MOD_REPLACE, 'passwordMinSpecials', '1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed configure password policy: ' + e.message['desc']) assert False @@ -131,7 +131,7 @@ def test_pwdAdmin_init(topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to add aci for password admin: ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_pwdAdmin_init(topology): log.info('test_pwdAdmin_init: Bind as the Password Administator (before activating)...') try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin_init: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -166,7 +166,7 @@ def test_pwdAdmin_init(topology): (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True log.info('test_pwdAdmin_init: Add failed as expected: password (%s) result (%s)' @@ -209,7 +209,7 @@ def test_pwdAdmin(topology): # Bind as Root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -217,7 +217,7 @@ def test_pwdAdmin(topology): # Set the password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -225,7 +225,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -239,7 +239,7 @@ def test_pwdAdmin(topology): (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add entry with password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -249,7 +249,7 @@ def test_pwdAdmin(topology): # Delete entry for the next pass try: topology.standalone.delete_s(ENTRY_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to delete entry: %s' % (e.message['desc'])) assert False @@ -260,7 +260,7 @@ def test_pwdAdmin(topology): entry.setValues('userpassword', ADMIN_PWD) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add entry with valid password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -274,7 +274,7 @@ def test_pwdAdmin(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -282,7 +282,7 @@ def test_pwdAdmin(topology): # Remove password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_DELETE, 'passwordAdminDN', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to remove password admin from config: ' + e.message['desc']) assert False @@ -290,7 +290,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin (who is no longer an admin) try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -303,7 +303,7 @@ def test_pwdAdmin(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True log.info('test_pwdAdmin: Password update failed as expected: password (%s) result (%s)' @@ -322,14 +322,14 @@ def test_pwdAdmin(topology): # Bind as root DN to make the update try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config - set the password admin try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -337,7 +337,7 @@ def test_pwdAdmin(topology): # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -348,7 +348,7 @@ def test_pwdAdmin(topology): for passwd in INVALID_PWDS: try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -362,14 +362,14 @@ def test_pwdAdmin(topology): # Bind as root DN to make the update try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config - set the password admin group try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_GROUP_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to add password admin to config: ' + e.message['desc']) assert False @@ -377,7 +377,7 @@ def test_pwdAdmin(topology): # Bind as admin2 try: topology.standalone.simple_bind_s(ADMIN2_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Failed to bind as the Password Admin2: ' + e.message['desc']) assert False @@ -386,7 +386,7 @@ def test_pwdAdmin(topology): for passwd in INVALID_PWDS: try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -395,7 +395,7 @@ def test_pwdAdmin(topology): # Cleanup - bind as Root DN for the other tests try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_pwdAdmin: Root DN failed to authenticate: ' + e.message['desc']) assert False @@ -412,7 +412,7 @@ def test_pwdAdmin_config_validation(topology): topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_ADD, 'passwordAdminDN', ENTRY_DN)]) log.fatal('test_pwdAdmin_config_validation: Incorrectly was able to add two config attributes') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_pwdAdmin_config_validation: Failed as expected: ' + e.message['desc']) @@ -421,7 +421,7 @@ def test_pwdAdmin_config_validation(topology): topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_ADD, 'passwordAdminDN', 'ZZZZZ')]) log.fatal('test_pwdAdmin_config_validation: Incorrectly was able to add invalid DN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('test_pwdAdmin_config_validation: Failed as expected: ' + e.message['desc']) diff --git a/dirsrvtests/suites/replication/cleanallruv_test.py b/dirsrvtests/suites/replication/cleanallruv_test.py index 18576ea..373269d 100644 --- a/dirsrvtests/suites/replication/cleanallruv_test.py +++ b/dirsrvtests/suites/replication/cleanallruv_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -56,7 +56,7 @@ class AddUsers(threading.Thread): except ldap.UNWILLING_TO_PERFORM: # One of the masters was probably put into read only mode - just break out break - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('AddUsers: failed to add (' + USER_DN + ') error: ' + e.message['desc']) assert False idx += 1 @@ -544,19 +544,19 @@ def test_cleanallruv_clean(topology): log.info('test_cleanallruv_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -566,7 +566,7 @@ def test_cleanallruv_clean(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -592,7 +592,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Unable to search master 1 for db tombstone: ' + e.message['desc']) # Check master 2 @@ -609,7 +609,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search master 2 for db tombstone: ' + e.message['desc']) # Check master 3 @@ -626,7 +626,7 @@ def test_cleanallruv_clean(topology): clean = False if clean: log.info('test_cleanallruv_clean: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean: Unable to search master 3 for db tombstone: ' + e.message['desc']) # Sleep a bit and give it chance to clean up... @@ -668,19 +668,19 @@ def test_cleanallruv_clean_restart(topology): log.info('test_cleanallruv_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -693,7 +693,7 @@ def test_cleanallruv_clean_restart(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -737,7 +737,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -755,7 +755,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -773,7 +773,7 @@ def test_cleanallruv_clean_restart(topology): clean = False if clean: log.info('test_cleanallruv_clean_restart: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_restart: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -827,19 +827,19 @@ def test_cleanallruv_clean_force(topology): log.info('test_cleanallruv_clean_force: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -850,7 +850,7 @@ def test_cleanallruv_clean_force(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', force=True, args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_clean_force: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -876,7 +876,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('test_cleanallruv_clean_force: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -894,7 +894,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -912,7 +912,7 @@ def test_cleanallruv_clean_force(topology): clean = False if clean: log.info('test_cleanallruv_clean_force: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_clean_force: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -961,19 +961,19 @@ def test_cleanallruv_abort(topology): log.info('test_cleanallruv_abort: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -987,7 +987,7 @@ def test_cleanallruv_abort(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1000,7 +1000,7 @@ def test_cleanallruv_abort(topology): try: topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running abortCleanAllRuv task: ' + e.message('desc')) assert False @@ -1033,7 +1033,7 @@ def test_cleanallruv_abort(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1064,19 +1064,19 @@ def test_cleanallruv_abort_restart(topology): log.info('test_cleanallruv_abort_restart: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_restart: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1090,7 +1090,7 @@ def test_cleanallruv_abort_restart(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1103,7 +1103,7 @@ def test_cleanallruv_abort_restart(topology): try: topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', certify=True, args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running test_cleanallruv_abort_restart task: ' + e.message('desc')) assert False @@ -1149,7 +1149,7 @@ def test_cleanallruv_abort_restart(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_restart: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1188,19 +1188,19 @@ def test_cleanallruv_abort_certify(topology): log.info('test_cleanallruv_abort_certify: remove all the agreements to master 4...)') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_abort_certify: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1214,7 +1214,7 @@ def test_cleanallruv_abort_certify(topology): try: (clean_task_dn, rc) = topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1224,7 +1224,7 @@ def test_cleanallruv_abort_certify(topology): try: (abort_task_dn, rc) = topology.master1.tasks.abortCleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', certify=True, args={TASK_WAIT: False}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running abortCleanAllRuv task: ' + e.message('desc')) assert False @@ -1286,7 +1286,7 @@ def test_cleanallruv_abort_certify(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_abort_certify: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1324,7 +1324,7 @@ def test_cleanallruv_stress_clean(topology): log.info('test_cleanallruv_stress_clean: put master 4 into read-only mode...') try: topology.master4.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-readonly', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to put master 4 into read-only mode: error ' + e.message['desc']) assert False @@ -1345,19 +1345,19 @@ def test_cleanallruv_stress_clean(topology): log.info('test_cleanallruv_stress_clean: remove all the agreements to master 4...') try: topology.master1.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m1 -> m4), error: ' + e.message['desc']) assert False try: topology.master2.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m2 -> m4), error: ' + e.message['desc']) assert False try: topology.master3.agreement.delete(DEFAULT_SUFFIX, topology.master4) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to delete agmt(m3 -> m4), error: ' + e.message['desc']) assert False @@ -1367,7 +1367,7 @@ def test_cleanallruv_stress_clean(topology): try: topology.master1.tasks.cleanAllRUV(suffix=DEFAULT_SUFFIX, replicaid='4', args={TASK_WAIT: True}) - except ValueError, e: + except ValueError as e: log.fatal('test_cleanallruv_stress_clean: Problem running cleanAllRuv task: ' + e.message('desc')) assert False @@ -1400,7 +1400,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 1 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 1 for db tombstone: ' + e.message['desc']) @@ -1418,7 +1418,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 2 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 2 for db tombstone: ' + e.message['desc']) @@ -1436,7 +1436,7 @@ def test_cleanallruv_stress_clean(topology): clean = False if clean: log.info('test_cleanallruv_stress_clean: Master 3 is cleaned.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Unable to search master 3 for db tombstone: ' + e.message['desc']) @@ -1457,7 +1457,7 @@ def test_cleanallruv_stress_clean(topology): # Turn off readonly mode try: topology.master4.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-readonly', 'off')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_cleanallruv_stress_clean: Failed to put master 4 into read-only mode: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py b/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py index e0e7ec6..2e70656 100644 --- a/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py +++ b/dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -84,7 +84,7 @@ def test_rootdn_init(topology): ';acl "all access";allow (all)(userdn="ldap:///anyone");)') try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_ADD, 'aci', ACI)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to add aci to config: error ' + e.message['desc']) assert False @@ -96,7 +96,7 @@ def test_rootdn_init(topology): topology.standalone.add_s(Entry((USER1_DN, {'objectclass': "top extensibleObject".split(), 'uid': 'user1', 'userpassword': PASSWORD}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to add test user ' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_rootdn_init(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_init: Failed to set dynamic plugins: error ' + e.message['desc']) assert False @@ -137,7 +137,7 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-open-time', open_time), (ldap.MOD_ADD, 'rootdn-close-time', close_time)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to set (blocking) open/close times: error ' + e.message['desc']) assert False @@ -148,7 +148,7 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -160,21 +160,21 @@ def test_rootdn_access_specific_time(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: test_rootdn: failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-open-time', '0000'), (ldap.MOD_REPLACE, 'rootdn-close-time', '2359')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to set (open) open/close times: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -185,14 +185,14 @@ def test_rootdn_access_specific_time(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-open-time', None), (ldap.MOD_DELETE, 'rootdn-close-time', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Failed to delete open and close time: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_specific_time: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -223,7 +223,7 @@ def test_rootdn_access_day_of_week(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-days-allowed', deny_days)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set the deny days: error ' + e.message['desc']) assert False @@ -234,7 +234,7 @@ def test_rootdn_access_day_of_week(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -246,21 +246,21 @@ def test_rootdn_access_day_of_week(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-days-allowed', allow_days)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set the deny days: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -270,14 +270,14 @@ def test_rootdn_access_day_of_week(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-days-allowed', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_day_of_week: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -295,7 +295,7 @@ def test_rootdn_access_denied_ip(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-ip', '127.0.0.1'), (ldap.MOD_ADD, 'rootdn-deny-ip', '::1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_rootdn_access_denied_ip(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -318,20 +318,20 @@ def test_rootdn_access_denied_ip(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-ip', '255.255.255.255')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -341,14 +341,14 @@ def test_rootdn_access_denied_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-deny-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -365,7 +365,7 @@ def test_rootdn_access_denied_host(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-deny-host', 'localhost.localdomain')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set deny host: error ' + e.message['desc']) assert False @@ -376,7 +376,7 @@ def test_rootdn_access_denied_host(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -388,20 +388,20 @@ def test_rootdn_access_denied_host(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-deny-host', '
i.dont.exist.com
')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -411,14 +411,14 @@ def test_rootdn_access_denied_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-deny-host', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Failed to set rootDN plugin config: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_denied_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -438,7 +438,7 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '255.255.255.255')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to set allowed host: error ' + e.message['desc']) assert False @@ -449,7 +449,7 @@ def test_rootdn_access_allowed_ip(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -461,21 +461,21 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-ip', '127.0.0.1'), (ldap.MOD_ADD, 'rootdn-allow-ip', '::1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to set allowed host: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -485,14 +485,14 @@ def test_rootdn_access_allowed_ip(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-ip', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Failed to delete(rootdn-allow-ip): error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_ip: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -512,7 +512,7 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'rootdn-allow-host', '
i.dont.exist.com
')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to set allowed host: error ' + e.message['desc']) assert False @@ -523,7 +523,7 @@ def test_rootdn_access_allowed_host(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) succeeded = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: succeeded = False if succeeded: @@ -535,20 +535,20 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.simple_bind_s(USER1_DN, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: : failed to bind as user1') assert False try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_ADD, 'rootdn-allow-host', 'localhost.localdomain')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to set allowed host: error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False @@ -558,14 +558,14 @@ def test_rootdn_access_allowed_host(topology): # try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_DELETE, 'rootdn-allow-host', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Failed to delete(rootdn-allow-host): error ' + e.message['desc']) assert False try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_rootdn_access_allowed_host: Root DN bind failed unexpectedly failed: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/suites/schema/test_schema.py b/dirsrvtests/suites/schema/test_schema.py index caeaec5..f23391a 100644 --- a/dirsrvtests/suites/schema/test_schema.py +++ b/dirsrvtests/suites/schema/test_schema.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -15,6 +15,7 @@ import os import sys import time import ldap +import six from ldap.cidict import cidict from ldap.schema import SubSchema import logging @@ -107,7 +108,7 @@ def mycmp(v1, v2): if not len(v1ary) == len(v2ary): return False for v1, v2 in zip(v1ary, v2ary): - if isinstance(v1, basestring): + if isinstance(v1, six.string_types): if not len(v1) == len(v2): return False if not v1 == v2: diff --git a/dirsrvtests/tickets/ticket365_test.py b/dirsrvtests/tickets/ticket365_test.py index a6b27ae..44aa3e8 100644 --- a/dirsrvtests/tickets/ticket365_test.py +++ b/dirsrvtests/tickets/ticket365_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -80,7 +80,7 @@ def test_ticket365(topology): 'uid': 'test_entry', 'userpassword': 'password' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test user: error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-enabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable audit log, error: ' + e.message['desc']) assert False ''' @@ -107,7 +107,7 @@ def test_ticket365(topology): try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-hide-unhashed-pw', 'off')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False @@ -116,7 +116,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_REPLACE, 'userpassword', 'mypassword')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False @@ -130,7 +130,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-auditlog-logging-hide-unhashed-pw', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to deny writing unhashed password to audit log, error: ' + e.message['desc']) assert False log.info('Test complete') @@ -140,7 +140,7 @@ def test_ticket365(topology): # try: topology.standalone.modify_s(USER_DN, [(ldap.MOD_REPLACE, 'userpassword', 'hidepassword')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable writing unhashed password to audit log, error: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47384_test.py b/dirsrvtests/tickets/ticket47384_test.py index 767646c..e5dc354 100644 --- a/dirsrvtests/tickets/ticket47384_test.py +++ b/dirsrvtests/tickets/ticket47384_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -72,13 +72,13 @@ def test_ticket47384(topology): # Copy the library to our tmp directory try: shutil.copy('%s/libwhoami-plugin.so' % plugin_dir, tmp_dir) - except IOError, e: + except IOError as e: log.fatal('Failed to copy libwhoami-plugin.so to the tmp directory, error: ' + e.strerror) assert False try: shutil.copy('%s/libwhoami-plugin.la' % plugin_dir, tmp_dir) - except IOError, e: + except IOError as e: log.fatal('Failed to copy libwhoami-plugin.la to the tmp directory, error: ' + e.strerror) assert False @@ -90,7 +90,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', '%s/libwhoami-plugin' % plugin_dir)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid plugin path (%s): error (%s)' % ('%s/libwhoami-plugin' % plugin_dir, e.message['desc'])) assert False @@ -99,7 +99,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', '%s/libwhoami-plugin' % tmp_dir)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid plugin path (%s): error (%s)' % ('%s/libwhoami-plugin' % tmp_dir, e.message['desc'])) assert False @@ -108,7 +108,7 @@ def test_ticket47384(topology): try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'nsslapd-pluginPath', 'libwhoami-plugin')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set valid relative plugin path (%s): error (%s)' % ('libwhoami-plugin' % tmp_dir, e.message['desc'])) assert False @@ -125,7 +125,7 @@ def test_ticket47384(topology): except ldap.UNWILLING_TO_PERFORM: # Correct, operation should be rejected pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set invalid plugin path (%s): error (%s)' % ('/bin/libwhoami-plugin', e.message['desc'])) @@ -141,7 +141,7 @@ def test_ticket47384(topology): except ldap.UNWILLING_TO_PERFORM: # Correct, operation should be rejected pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set invalid plugin path (%s): error (%s)' % ('../libwhoami-plugin', e.message['desc'])) diff --git a/dirsrvtests/tickets/ticket47462_test.py b/dirsrvtests/tickets/ticket47462_test.py index 17854fa..c88cf43 100644 --- a/dirsrvtests/tickets/ticket47462_test.py +++ b/dirsrvtests/tickets/ticket47462_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import sys @@ -155,14 +155,14 @@ def test_ticket47462(topology): try: topology.master1.modify_s(DES_PLUGIN, [(ldap.MOD_REPLACE, 'nsslapd-pluginEnabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to enable DES plugin, error: ' + e.message['desc']) assert False try: topology.master1.modify_s(DES_PLUGIN, [(ldap.MOD_ADD, 'nsslapd-pluginarg2', 'description')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to reset DES plugin, error: ' + e.message['desc']) assert False @@ -172,7 +172,7 @@ def test_ticket47462(topology): except ldap.NO_SUCH_ATTRIBUTE: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to reset MMR plugin, error: ' + e.message['desc']) assert False @@ -183,7 +183,7 @@ def test_ticket47462(topology): topology.master1.delete_s(AES_PLUGIN) except ldap.NO_SUCH_OBJECT: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to delete AES plugin, error: ' + e.message['desc']) assert False @@ -201,7 +201,7 @@ def test_ticket47462(topology): else: log.fatal('No replication agreements!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to search for replica credentials: ' + e.message['desc']) assert False @@ -235,7 +235,7 @@ def test_ticket47462(topology): assert False else: log.info('Replication test passed') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add test user: ' + e.message['desc']) assert False @@ -261,7 +261,7 @@ def test_ticket47462(topology): else: log.fatal('Failed to find any entries with nsDS5ReplicaCredentials ') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to search for replica credentials: ' + e.message['desc']) assert False @@ -278,7 +278,7 @@ def test_ticket47462(topology): assert False else: log.info('The AES plugin was correctly setup') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -292,7 +292,7 @@ def test_ticket47462(topology): assert False else: log.info('The MMR plugin was correctly updated') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -306,7 +306,7 @@ def test_ticket47462(topology): assert False else: log.info('The DES plugin was correctly updated') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to find AES plugin: ' + e.message['desc']) assert False @@ -332,7 +332,7 @@ def test_ticket47462(topology): assert False else: log.info('Replication test passed') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add test user: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47640_test.py b/dirsrvtests/tickets/ticket47640_test.py index ef9cdd5..cd450ab 100644 --- a/dirsrvtests/tickets/ticket47640_test.py +++ b/dirsrvtests/tickets/ticket47640_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -66,13 +66,13 @@ def test_ticket47640(topology): # Enable Dynamic plugins, and the linked Attrs plugin try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: ldap.fatal('Failed to enable dynamic plugin!' + e.message['desc']) assert False try: topology.standalone.plugins.enable(name=PLUGIN_LINKED_ATTRS) - except ValueError, e: + except ValueError as e: ldap.fatal('Failed to enable linked attributes plugin!' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_ticket47640(topology): 'linkType': 'seeAlso', 'managedType': 'seeAlso' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add linked attr config entry: error ' + e.message['desc']) assert False @@ -100,7 +100,7 @@ def test_ticket47640(topology): # Success log.info('Add operation correctly rejected.') OP_REJECTED = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Add operation incorrectly rejected: error %s - ' + 'expected "unwilling to perform"' % e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47653MMR_test.py b/dirsrvtests/tickets/ticket47653MMR_test.py index b08501b..0c6da02 100644 --- a/dirsrvtests/tickets/ticket47653MMR_test.py +++ b/dirsrvtests/tickets/ticket47653MMR_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # ''' @@ -300,7 +300,7 @@ def test_ticket47653_add(topology): topology.master1.log.info("Try to add Add %s should be successful" % ENTRY_DN) try: topology.master1.add_s(entry_with_member) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.master1.log.info("Failed to add entry, error: " + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47669_test.py b/dirsrvtests/tickets/ticket47669_test.py index dccfdcc..5458fba 100644 --- a/dirsrvtests/tickets/ticket47669_test.py +++ b/dirsrvtests/tickets/ticket47669_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -33,6 +33,7 @@ COMPACTDBINTERVAL = 'nsslapd-changelogcompactdb-interval' FILTER = '(cn=*)' + class TopologyStandalone(object): def __init__(self, standalone): standalone.open() @@ -77,6 +78,7 @@ def topology(request): # Here we have standalone instance up and running return TopologyStandalone(standalone) + def test_ticket47669_init(topo): """ Add cn=changelog5,cn=config @@ -93,19 +95,20 @@ def test_ticket47669_init(topo): topo.standalone.add_s(Entry((CHANGELOG, {'objectclass': 'top extensibleObject'.split(), 'nsslapd-changelogdir': changelogdir}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + CHANGELOG + ': error ' + e.message['desc']) assert False try: topo.standalone.modify_s(RETROCHANGELOG, [(ldap.MOD_REPLACE, 'nsslapd-pluginEnabled', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable ' + RETROCHANGELOG + ': error ' + e.message['desc']) assert False # restart the server topo.standalone.restart(timeout=10) + def add_and_check(topo, plugin, attr, val, isvalid): """ Helper function to add/replace attr: val and check the added value @@ -114,7 +117,7 @@ def add_and_check(topo, plugin, attr, val, isvalid): log.info('Test %s: %s -- valid' % (attr, val)) try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) assert False else: @@ -122,12 +125,12 @@ def add_and_check(topo, plugin, attr, val, isvalid): if plugin == CHANGELOG: try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Expectedly failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) else: try: topo.standalone.modify_s(plugin, [(ldap.MOD_REPLACE, attr, val)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + attr + ': ' + val + ' to ' + plugin + ': error ' + e.message['desc']) try: @@ -145,7 +148,7 @@ def add_and_check(topo, plugin, attr, val, isvalid): if not entries[0].hasValue(attr, val): log.fatal('%s does not have expected (%s: %s)' % (plugin, attr, val)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (plugin, e.message['desc'])) assert False @@ -169,6 +172,7 @@ def test_ticket47669_changelog_maxage(topo): add_and_check(topo, CHANGELOG, MAXAGE, '-123', False) add_and_check(topo, CHANGELOG, MAXAGE, 'xyz', False) + def test_ticket47669_changelog_triminterval(topo): """ Test nsslapd-changelogtrim-interval in cn=changelog5,cn=config @@ -188,6 +192,7 @@ def test_ticket47669_changelog_triminterval(topo): add_and_check(topo, CHANGELOG, TRIMINTERVAL, '-123', False) add_and_check(topo, CHANGELOG, TRIMINTERVAL, 'xyz', False) + def test_ticket47669_changelog_compactdbinterval(topo): """ Test nsslapd-changelogcompactdb-interval in cn=changelog5,cn=config @@ -207,6 +212,7 @@ def test_ticket47669_changelog_compactdbinterval(topo): add_and_check(topo, CHANGELOG, COMPACTDBINTERVAL, '-123', False) add_and_check(topo, CHANGELOG, COMPACTDBINTERVAL, 'xyz', False) + def test_ticket47669_retrochangelog_maxage(topo): """ Test nsslapd-changelogmaxage in cn=Retro Changelog Plugin,cn=plugins,cn=config @@ -228,10 +234,12 @@ def test_ticket47669_retrochangelog_maxage(topo): topo.standalone.log.info("ticket47669 was successfully verified.") + def test_ticket47669_final(topology): topology.standalone.delete() log.info('Testcase PASSED') + def run_isolated(): """ run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) diff --git a/dirsrvtests/tickets/ticket47714_test.py b/dirsrvtests/tickets/ticket47714_test.py index c49d455..400c243 100644 --- a/dirsrvtests/tickets/ticket47714_test.py +++ b/dirsrvtests/tickets/ticket47714_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -135,7 +135,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -148,7 +148,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s again ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -170,7 +170,7 @@ def test_ticket47714_run_0(topology): log.info("\n######################### Bind as %s again to fail ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.info('CONSTRAINT VIOLATION ' + e.message['desc']) log.info("%s was successfully inactivated." % TEST_USER_DN) pass @@ -206,7 +206,7 @@ def test_ticket47714_run_1(topology): log.info("\n######################### Bind as %s ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -219,7 +219,7 @@ def test_ticket47714_run_1(topology): log.info("\n######################### Bind as %s again ######################\n" % TEST_USER_DN) try: topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PW) - except ldap.CONSTRAINT_VIOLATION, e: + except ldap.CONSTRAINT_VIOLATION as e: log.error('CONSTRAINT VIOLATION ' + e.message['desc']) topology.standalone.simple_bind_s(DN_DM, PASSWORD) diff --git a/dirsrvtests/tickets/ticket47781_test.py b/dirsrvtests/tickets/ticket47781_test.py index 8bcb926..c52612e 100644 --- a/dirsrvtests/tickets/ticket47781_test.py +++ b/dirsrvtests/tickets/ticket47781_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -103,7 +103,7 @@ def test_ticket47781(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry 1: ' + e.message['desc']) assert False @@ -112,7 +112,7 @@ def test_ticket47781(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry2'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry 2: ' + e.message['desc']) assert False @@ -158,7 +158,7 @@ def test_ticket47781(topology): if not entries: log.fatal('Search failed to find any entries.') assert PR_False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert PR_False diff --git a/dirsrvtests/tickets/ticket47815_test.py b/dirsrvtests/tickets/ticket47815_test.py index 34a14c0..675e97b 100644 --- a/dirsrvtests/tickets/ticket47815_test.py +++ b/dirsrvtests/tickets/ticket47815_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -131,7 +131,7 @@ def test_ticket47815(topology): except ldap.UNWILLING_TO_PERFORM: log.debug('Adding invalid entry failed as expected') result = 53 - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Unexpected result ' + e.message['desc']) assert False if result == 0: @@ -147,7 +147,7 @@ def test_ticket47815(topology): except ldap.UNWILLING_TO_PERFORM: log.debug('2nd add of invalid entry failed as expected') result2 = 53 - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Unexpected result ' + e.message['desc']) assert False if result2 == 0: diff --git a/dirsrvtests/tickets/ticket47819_test.py b/dirsrvtests/tickets/ticket47819_test.py index 6574d61..435b36c 100644 --- a/dirsrvtests/tickets/ticket47819_test.py +++ b/dirsrvtests/tickets/ticket47819_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -97,13 +97,13 @@ def test_ticket47819(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry: ' + e.message['desc']) assert False try: topology.standalone.delete_s('cn=entry1,dc=example,dc=com') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete entry: ' + e.message['desc']) assert False @@ -114,7 +114,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search failed to the new tombstone(nsTombstoneCSN is probably missing).') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -169,7 +169,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search failed to fine the new tombstone(nsTombstoneCSN is probably missing).') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -198,7 +198,7 @@ def test_ticket47819(topology): if entries: log.fatal('Search found tombstones with nsTombstoneCSN') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -218,7 +218,7 @@ def test_ticket47819(topology): if not entries: log.fatal('Search did not find any fixed-up tombstones') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False @@ -249,7 +249,7 @@ def test_ticket47819(topology): 'objectclass': 'top person'.split(), 'sn': 'user', 'cn': 'entry1'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add entry: ' + e.message['desc']) assert False @@ -265,7 +265,7 @@ def test_ticket47819(topology): if entries: log.fatal('Search unexpectedly found tombstones') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47900_test.py b/dirsrvtests/tickets/ticket47900_test.py index fde297b..c01b733 100644 --- a/dirsrvtests/tickets/ticket47900_test.py +++ b/dirsrvtests/tickets/ticket47900_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -99,7 +99,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Creating Password Administator entry %s..." % ADMIN_DN) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Unexpected result ' + e.message['desc']) assert False topology.standalone.log.error("Failed to add Password Administator %s, error: %s " @@ -115,7 +115,7 @@ def test_ticket47900(topology): (ldap.MOD_REPLACE, 'passwordExp' , 'on'), (ldap.MOD_REPLACE, 'passwordMinDigits' , '1'), (ldap.MOD_REPLACE, 'passwordMinSpecials' , '1')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed configure password policy: ' + e.message['desc']) assert False @@ -132,7 +132,7 @@ def test_ticket47900(topology): mod = [(ldap.MOD_ADD, 'aci', ACI_BODY)] try: topology.standalone.modify_s(SUFFIX, mod) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add aci for password admin: ' + e.message['desc']) assert False @@ -142,7 +142,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Bind as the Password Administator (before activating)...") try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -164,7 +164,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Create a regular user entry %s with password (%s)..." % (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True topology.standalone.log.info('Add failed as expected: password (%s) result (%s)' @@ -184,21 +184,21 @@ def test_ticket47900(topology): # Bind as Root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add password admin to config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -210,7 +210,7 @@ def test_ticket47900(topology): topology.standalone.log.info("Create a regular user entry %s with password (%s)..." % (ENTRY_DN, passwd)) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add entry with password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -220,7 +220,7 @@ def test_ticket47900(topology): # Delete entry for the next pass try: topology.standalone.delete_s(ENTRY_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to delete entry: %s' % (e.message['desc'])) assert False @@ -230,7 +230,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', ADMIN_PWD) try: topology.standalone.add_s(entry) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add entry with valid password (%s) result (%s)' % (passwd, e.message['desc'])) assert False @@ -243,21 +243,21 @@ def test_ticket47900(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_DELETE, 'passwordAdminDN', None)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to remove password admin from config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -269,7 +269,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: # We failed as expected failed_as_expected = True topology.standalone.log.info('Password update failed as expected: password (%s) result (%s)' @@ -288,21 +288,21 @@ def test_ticket47900(topology): # Bind as root DN try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Root DN failed to authenticate: ' + e.message['desc']) assert False # Update config try: topology.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'passwordAdminDN', ADMIN_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to add password admin to config: ' + e.message['desc']) assert False # Bind as Password Admin try: topology.standalone.simple_bind_s(ADMIN_DN, ADMIN_PWD) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Failed to bind as the Password Admin: ' + e.message['desc']) assert False @@ -313,7 +313,7 @@ def test_ticket47900(topology): entry.setValues('userpassword', passwd) try: topology.standalone.modify_s(ENTRY_DN, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('Password update failed unexpectedly: password (%s) result (%s)' % (passwd, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47920_test.py b/dirsrvtests/tickets/ticket47920_test.py index 139cb06..d4f6a53 100644 --- a/dirsrvtests/tickets/ticket47920_test.py +++ b/dirsrvtests/tickets/ticket47920_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -161,7 +161,7 @@ def test_ticket47920_mod_readentry_ctrl(topology): assert resp_ctrls[0].dn == ACTIVE_USER_DN assert 'description' in resp_ctrls[0].entry assert 'cn' in resp_ctrls[0].entry - print resp_ctrls[0].entry['description'] + print(resp_ctrls[0].entry['description']) ent = topology.standalone.getEntry(ACTIVE_USER_DN, ldap.SCOPE_BASE, "(objectclass=*)", ['description']) assert ent.hasAttr('description') diff --git a/dirsrvtests/tickets/ticket47921_test.py b/dirsrvtests/tickets/ticket47921_test.py index e8067bc..4f3d54e 100644 --- a/dirsrvtests/tickets/ticket47921_test.py +++ b/dirsrvtests/tickets/ticket47921_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -73,7 +73,7 @@ def test_ticket47921(topology): 'cosIndirectSpecifier': 'manager', 'cosAttribute': 'roomnumber' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add cos defintion, error: ' + e.message['desc']) assert False @@ -84,7 +84,7 @@ def test_ticket47921(topology): 'uid': 'my manager', 'roomnumber': '1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add manager entry, error: ' + e.message['desc']) assert False @@ -98,7 +98,7 @@ def test_ticket47921(topology): 'uid': 'user', 'manager': MANAGER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Failed to add manager entry, error: ' + e.message['desc']) assert False @@ -114,14 +114,14 @@ def test_ticket47921(topology): else: log.fatal('Failed to find user entry') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search for user entry: ' + e.message['desc']) assert False # Modify manager entry try: topology.standalone.modify_s(MANAGER_DN, [(ldap.MOD_REPLACE, 'roomnumber', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to modify manager entry: ' + e.message['desc']) assert False @@ -137,7 +137,7 @@ def test_ticket47921(topology): else: log.fatal('Failed to find user entry') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search for user entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47927_test.py b/dirsrvtests/tickets/ticket47927_test.py index e389ff4..78e0b29 100644 --- a/dirsrvtests/tickets/ticket47927_test.py +++ b/dirsrvtests/tickets/ticket47927_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -74,6 +74,7 @@ def topology(request): return TopologyStandalone(standalone) + def test_ticket47927_init(topology): topology.standalone.plugins.enable(name=PLUGIN_ATTR_UNIQUENESS) try: @@ -81,7 +82,7 @@ def test_ticket47927_init(topology): [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', 'telephonenumber'), (ldap.MOD_REPLACE, 'uniqueness-subtrees', DEFAULT_SUFFIX), ]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927: Failed to configure plugin for "telephonenumber": error ' + e.message['desc']) assert False topology.standalone.restart(timeout=120) @@ -111,7 +112,8 @@ def test_ticket47927_init(topology): 'objectclass': "top person".split(), 'sn': USER_4_CN, 'cn': USER_4_CN}))) - + + def test_ticket47927_one(topology): ''' Check that uniqueness is enforce on all SUFFIX @@ -120,7 +122,7 @@ def test_ticket47927_one(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed to set the telephonenumber for %s: %s' % (USER_1_DN, e.message['desc'])) assert False @@ -130,7 +132,7 @@ def test_ticket47927_one(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_one: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN, e.message['desc'])) pass @@ -141,7 +143,7 @@ def test_ticket47927_one(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_one: unexpected success to set the telephonenumber for %s' % (USER_3_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_one: Failed (expected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) pass @@ -153,11 +155,12 @@ def test_ticket47927_two(topology): try: topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'uniqueness-exclude-subtrees', EXCLUDED_CONTAINER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_two: Failed to configure plugin for to exclude %s: error %s' % (EXCLUDED_CONTAINER_DN, e.message['desc'])) assert False topology.standalone.restart(timeout=120) + def test_ticket47927_three(topology): ''' Check that uniqueness is enforced on full SUFFIX except EXCLUDED_CONTAINER_DN @@ -168,17 +171,17 @@ def test_ticket47927_three(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed to set the telephonenumber ' + e.message['desc']) assert False - + # we should not be allowed to set this value (because user1 is in the scope) try: topology.standalone.modify_s(USER_2_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_three: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN , e.message['desc'])) @@ -187,7 +190,7 @@ def test_ticket47927_three(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_three: success to set the telephonenumber for %s' % (USER_3_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_three: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False @@ -204,7 +207,7 @@ def test_ticket47927_four(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_four: success to set the telephonenumber for %s' % USER_3_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False @@ -213,7 +216,7 @@ def test_ticket47927_four(topology): try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed to set the telephonenumber for %s: %s' % (USER_1_DN, e.message['desc'])) assert False @@ -223,10 +226,11 @@ def test_ticket47927_four(topology): [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_four: unexpected success to set the telephonenumber %s' % USER_2_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_four: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN, e.message['desc'])) pass + def test_ticket47927_five(topology): ''' Exclude the EXCLUDED_BIS_CONTAINER_DN from the uniqueness plugin @@ -234,12 +238,13 @@ def test_ticket47927_five(topology): try: topology.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', [(ldap.MOD_ADD, 'uniqueness-exclude-subtrees', EXCLUDED_BIS_CONTAINER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_five: Failed to configure plugin for to exclude %s: error %s' % (EXCLUDED_BIS_CONTAINER_DN, e.message['desc'])) assert False topology.standalone.restart(timeout=120) topology.standalone.getEntry('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config', ldap.SCOPE_BASE) + def test_ticket47927_six(topology): ''' Check that uniqueness is enforced on full SUFFIX except EXCLUDED_CONTAINER_DN @@ -247,21 +252,21 @@ def test_ticket47927_six(topology): First case: it exists an entry (with the same attribute value) in the scope of the plugin and we set the value in an entry that is in an excluded scope ''' - UNIQUE_VALUE='222' + UNIQUE_VALUE = '222' try: topology.standalone.modify_s(USER_1_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed to set the telephonenumber ' + e.message['desc']) assert False - + # we should not be allowed to set this value (because user1 is in the scope) try: topology.standalone.modify_s(USER_2_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: unexpected success to set the telephonenumber for %s' % (USER_2_DN)) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (expected) to set the telephonenumber for %s: %s' % (USER_2_DN , e.message['desc'])) @@ -270,7 +275,7 @@ def test_ticket47927_six(topology): topology.standalone.modify_s(USER_3_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: success to set the telephonenumber for %s' % (USER_3_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_3_DN, e.message['desc'])) assert False # USER_4_DN is in EXCLUDED_CONTAINER_DN so update should be successful @@ -278,7 +283,7 @@ def test_ticket47927_six(topology): topology.standalone.modify_s(USER_4_DN, [(ldap.MOD_REPLACE, 'telephonenumber', UNIQUE_VALUE)]) log.fatal('test_ticket47927_six: success to set the telephonenumber for %s' % (USER_4_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket47927_six: Failed (unexpected) to set the telephonenumber for %s: %s' % (USER_4_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47937_test.py b/dirsrvtests/tickets/ticket47937_test.py index 7a65db6..6c09cf8 100644 --- a/dirsrvtests/tickets/ticket47937_test.py +++ b/dirsrvtests/tickets/ticket47937_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -81,7 +81,7 @@ def test_ticket47937(topology): except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=people org unit: error ' + e.message['desc']) assert False @@ -92,7 +92,7 @@ def test_ticket47937(topology): 'ou': 'ranges' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=ranges org unit: error ' + e.message['desc']) assert False @@ -103,7 +103,7 @@ def test_ticket47937(topology): 'cn': 'entry' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add test entry: error ' + e.message['desc']) assert False @@ -117,7 +117,7 @@ def test_ticket47937(topology): 'dnaRemainingValues': '9501' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add shared config entry: error ' + e.message['desc']) assert False @@ -134,7 +134,7 @@ def test_ticket47937(topology): 'dnaSharedCfgDN': 'ou=ranges,%s' % SUFFIX }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add DNA config entry: error ' + e.message['desc']) assert False @@ -156,7 +156,7 @@ def test_ticket47937(topology): try: topology.standalone.modify_s('cn=dna config,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config', [(ldap.MOD_REPLACE, 'dnaType', 'foo')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info('Operation failed as expected (error: %s)' % e.message['desc']) else: log.error('Operation incorectly succeeded! Test Failed!') diff --git a/dirsrvtests/tickets/ticket47950_test.py b/dirsrvtests/tickets/ticket47950_test.py index a1bf48c..7226637 100644 --- a/dirsrvtests/tickets/ticket47950_test.py +++ b/dirsrvtests/tickets/ticket47950_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -85,7 +85,7 @@ def test_ticket47950(topology): try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'nsslapd-plugin-binddn-tracking', 'on')]) log.info('nsslapd-plugin-binddn-tracking enabled.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable bind dn tracking: ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_ticket47950(topology): 'sn': "1", 'cn': "user 1"}))) log.info('Added test user %s' % USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add %s: %s' % (USER1_DN, e.message['desc'])) assert False @@ -109,7 +109,7 @@ def test_ticket47950(topology): 'sn': "2", 'cn': "user 2"}))) log.info('Added test user %s' % USER2_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: ' + e.message['desc']) assert False @@ -122,7 +122,7 @@ def test_ticket47950(topology): topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_ADD, 'aci', acival)]) log.info('Added aci') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add aci: ' + e.message['desc']) assert False @@ -132,14 +132,14 @@ def test_ticket47950(topology): try: topology.standalone.simple_bind_s(USER1_DN, "password") log.info('Bind as user %s successful' % USER1_DN) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to bind as user1: ' + e.message['desc']) assert False try: topology.standalone.modify_s(USER2_DN, [(ldap.MOD_REPLACE, 'cn', 'new value')]) log.info('%s successfully modified user %s' % (USER1_DN, USER2_DN)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to update user2: ' + e.message['desc']) assert False @@ -149,7 +149,7 @@ def test_ticket47950(topology): try: topology.standalone.simple_bind_s(DN_DM, PASSWORD) log.info('Bind as %s successful' % DN_DM) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to bind as rootDN: ' + e.message['desc']) assert False @@ -171,7 +171,7 @@ def test_ticket47950(topology): repl_agreement = topology.standalone.agreement.create(suffix=DEFAULT_SUFFIX, host="127.0.0.1", port="7777", properties=properties) log.info('Successfully created replication agreement') - except InvalidArgumentError, e: + except InvalidArgumentError as e: log.error('Failed to create replication agreement: ' + e.message['desc']) assert False @@ -182,7 +182,7 @@ def test_ticket47950(topology): properties = {REPLICA_ID: "7"} topology.standalone.replica.setProperties(DEFAULT_SUFFIX, None, None, properties) log.info('Successfully modified replica') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to update replica config: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47953_test.py b/dirsrvtests/tickets/ticket47953_test.py index 4e8acf8..f64d899 100644 --- a/dirsrvtests/tickets/ticket47953_test.py +++ b/dirsrvtests/tickets/ticket47953_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -98,7 +98,7 @@ def test_ticket47953(topology): try: topology.standalone.modify_s(DEFAULT_SUFFIX, [(ldap.MOD_DELETE, 'aci', acival)]) log.info('Removed invalid aci.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to remove invalid aci: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47963_test.py b/dirsrvtests/tickets/ticket47963_test.py index b3366af..deed905 100644 --- a/dirsrvtests/tickets/ticket47963_test.py +++ b/dirsrvtests/tickets/ticket47963_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -75,7 +75,7 @@ def test_ticket47963(topology): topology.standalone.plugins.enable(name=PLUGIN_MEMBER_OF) try: topology.standalone.modify_s(PLUGIN_DN, [(ldap.MOD_REPLACE, 'memberofskipnested', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('test_automember: Failed to modify config entry: error ' + e.message['desc']) assert False @@ -89,7 +89,7 @@ def test_ticket47963(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'test_user' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add teset user: error ' + e.message['desc']) assert False @@ -99,7 +99,7 @@ def test_ticket47963(topology): 'cn': 'group1', 'member': USER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group1: error ' + e.message['desc']) assert False @@ -109,7 +109,7 @@ def test_ticket47963(topology): 'cn': 'group2', 'member': USER_DN }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group2: error ' + e.message['desc']) assert False @@ -119,7 +119,7 @@ def test_ticket47963(topology): 'objectclass': 'top groupOfNames groupOfUniqueNames extensibleObject'.split(), 'cn': 'group' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add group3: error ' + e.message['desc']) assert False time.sleep(1) @@ -133,14 +133,14 @@ def test_ticket47963(topology): if not entries: log.fatal('User is missing expected memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False # Add the user to the group try: topology.standalone.modify_s(GROUP_DN3, [(ldap.MOD_ADD, 'member', USER_DN)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to member to group: error ' + e.message['desc']) assert False time.sleep(1) @@ -153,7 +153,7 @@ def test_ticket47963(topology): if not entries: log.fatal('User is missing expected memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False @@ -162,7 +162,7 @@ def test_ticket47963(topology): # try: topology.standalone.delete_s(GROUP_DN2) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete test group2: ' + e.message['desc']) assert False time.sleep(1) @@ -173,7 +173,7 @@ def test_ticket47963(topology): if not entries: log.fatal('User incorrect memberOf attrs') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search for user1 failed: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47970_test.py b/dirsrvtests/tickets/ticket47970_test.py index b0199f8..a748939 100644 --- a/dirsrvtests/tickets/ticket47970_test.py +++ b/dirsrvtests/tickets/ticket47970_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -86,14 +86,14 @@ def test_ticket47970(topology): try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'passwordLockout', 'on')]) log.info('account lockout enabled.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to enable account lockout: ' + e.message['desc']) assert False try: topology.standalone.modify_s("cn=config", [(ldap.MOD_REPLACE, 'passwordMaxFailure', '5')]) log.info('passwordMaxFailure set.') - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to to set passwordMaxFailure: ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_ticket47970(topology): pw = "secret" auth_tokens = ldap.sasl.digest_md5(user_name, pw) topology.standalone.sasl_interactive_bind_s("", auth_tokens) - except ldap.INVALID_CREDENTIALS, e: + except ldap.INVALID_CREDENTIALS as e: log.info("SASL Bind failed as expected") failed_as_expected = True @@ -121,7 +121,7 @@ def test_ticket47970(topology): entry = topology.standalone.search_s("", ldap.SCOPE_BASE, "passwordRetryCount=*", ['passwordRetryCount']) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to search Root DSE entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket47973_test.py b/dirsrvtests/tickets/ticket47973_test.py index dfe9bb5..12bb789 100644 --- a/dirsrvtests/tickets/ticket47973_test.py +++ b/dirsrvtests/tickets/ticket47973_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -83,7 +83,7 @@ def task_complete(conn, task_dn): if task_entry[0].hasAttr('nstaskexitcode'): # task is done finished = True - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('wait_for_task: Search failed: ' + e.message['desc']) assert False @@ -106,7 +106,7 @@ def test_ticket47973(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -126,7 +126,7 @@ def test_ticket47973(topology): 'objectclass': 'top extensibleObject'.split(), 'cn': 'task-' + str(task_count) }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add task entry: error ' + e.message['desc']) assert False @@ -145,7 +145,7 @@ def test_ticket47973(topology): if not entries or not entries[0]: log.fatal('User was not returned from search!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47980_test.py b/dirsrvtests/tickets/ticket47980_test.py index 256f195..34f0d3f 100644 --- a/dirsrvtests/tickets/ticket47980_test.py +++ b/dirsrvtests/tickets/ticket47980_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -139,7 +139,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level1: error ' + e.message['desc']) assert False @@ -148,7 +148,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level2: error ' + e.message['desc']) assert False @@ -157,7 +157,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'level3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level3: error ' + e.message['desc']) assert False @@ -169,7 +169,7 @@ def test_ticket47980(topology): }))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level4: error ' + e.message['desc']) assert False @@ -178,7 +178,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'ou': 'level5' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level5: error ' + e.message['desc']) assert False @@ -187,7 +187,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'level6' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add level6: error ' + e.message['desc']) assert False @@ -197,7 +197,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -206,7 +206,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user2' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user2: error ' + e.message['desc']) assert False @@ -215,7 +215,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user3' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user3: error ' + e.message['desc']) assert False @@ -224,7 +224,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user4' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user4: error ' + e.message['desc']) assert False @@ -233,7 +233,7 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user5' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user5: error ' + e.message['desc']) assert False @@ -242,14 +242,14 @@ def test_ticket47980(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user6' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user6: error ' + e.message['desc']) assert False # Enable password policy try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -262,7 +262,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level1: error ' + e.message['desc']) assert False @@ -278,7 +278,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level1: error ' + e.message['desc']) assert False @@ -291,7 +291,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level1,dc=example,dc=com', 'pwdpolicysubentry': BRANCH1_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level1: error ' + e.message['desc']) assert False @@ -303,7 +303,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH1_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level1: error ' + e.message['desc']) assert False @@ -316,7 +316,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level2: error ' + e.message['desc']) assert False @@ -332,7 +332,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level2: error ' + e.message['desc']) assert False @@ -345,7 +345,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level2,dc=example,dc=com', 'pwdpolicysubentry': BRANCH2_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level2: error ' + e.message['desc']) assert False @@ -357,7 +357,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH2_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level2: error ' + e.message['desc']) assert False @@ -370,7 +370,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level3: error ' + e.message['desc']) assert False @@ -386,7 +386,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for level3: error ' + e.message['desc']) assert False @@ -399,7 +399,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=level3,dc=example,dc=com', 'pwdpolicysubentry': BRANCH3_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level3: error ' + e.message['desc']) assert False @@ -411,7 +411,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH3_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level3: error ' + e.message['desc']) assert False @@ -424,7 +424,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for level3: error ' + e.message['desc']) assert False @@ -440,7 +440,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch4: error ' + e.message['desc']) assert False @@ -453,7 +453,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH4_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for level3: error ' + e.message['desc']) assert False @@ -465,7 +465,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH4_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for branch4: error ' + e.message['desc']) assert False @@ -478,7 +478,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for branch5: error ' + e.message['desc']) assert False @@ -494,7 +494,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch5: error ' + e.message['desc']) assert False @@ -507,7 +507,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=lower,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH5_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for branch5: error ' + e.message['desc']) assert False @@ -519,7 +519,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH5_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for level3: error ' + e.message['desc']) assert False @@ -532,7 +532,7 @@ def test_ticket47980(topology): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for branch6: error ' + e.message['desc']) assert False @@ -548,7 +548,7 @@ def test_ticket47980(topology): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy for branch6: error ' + e.message['desc']) assert False @@ -561,7 +561,7 @@ def test_ticket47980(topology): 'cn': 'cn=nsPwTemplateEntry,ou=lower,ou=lower,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH6_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template for branch6: error ' + e.message['desc']) assert False @@ -573,7 +573,7 @@ def test_ticket47980(topology): 'costemplatedn': BRANCH6_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def for branch6: error ' + e.message['desc']) assert False @@ -587,7 +587,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH1_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER1_DN, e.message['desc'])) assert False @@ -596,7 +596,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH2_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER2_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER2_DN, e.message['desc'])) assert False @@ -605,7 +605,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH3_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER3_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER3_DN, e.message['desc'])) assert False @@ -614,7 +614,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH4_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER4_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER4_DN, e.message['desc'])) assert False @@ -623,7 +623,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH5_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER5_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER5_DN, e.message['desc'])) assert False @@ -632,7 +632,7 @@ def test_ticket47980(topology): if not entries[0].hasValue('pwdpolicysubentry', BRANCH6_PWP): log.fatal('User %s does not have expected pwdpolicysubentry!' % USER6_DN) assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER6_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket47981_test.py b/dirsrvtests/tickets/ticket47981_test.py index 00025ea..b25d7dd 100644 --- a/dirsrvtests/tickets/ticket47981_test.py +++ b/dirsrvtests/tickets/ticket47981_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -89,7 +89,7 @@ def addSubtreePwPolicy(inst): 'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container for ou=people: error ' + e.message['desc']) assert False @@ -105,7 +105,7 @@ def addSubtreePwPolicy(inst): 'passwordChange': 'off', 'passwordStorageScheme': 'ssha' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy: error ' + e.message['desc']) assert False @@ -118,7 +118,7 @@ def addSubtreePwPolicy(inst): 'cn': 'cn=nsPwTemplateEntry,ou=people,dc=example,dc=com', 'pwdpolicysubentry': BRANCH_PWP }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template: error ' + e.message['desc']) assert False @@ -130,7 +130,7 @@ def addSubtreePwPolicy(inst): 'costemplatedn': BRANCH_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def: error ' + e.message['desc']) assert False time.sleep(0.5) @@ -139,25 +139,25 @@ def addSubtreePwPolicy(inst): def delSubtreePwPolicy(inst): try: inst.delete_s(BRANCH_COS_DEF) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS def: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_COS_TMPL) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS template: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_PWP) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS password policy: error ' + e.message['desc']) assert False try: inst.delete_s(BRANCH_CONTAINER) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete COS container: error ' + e.message['desc']) assert False time.sleep(0.5) @@ -185,7 +185,7 @@ def test_ticket47981(topology): 'o': BE_NAME}))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to create suffix entry: error ' + e.message['desc']) assert False @@ -201,7 +201,7 @@ def test_ticket47981(topology): }))) except ldap.ALREADY_EXISTS: pass - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ou=people: error ' + e.message['desc']) assert False @@ -213,7 +213,7 @@ def test_ticket47981(topology): 'objectclass': 'top extensibleObject'.split(), 'uid': 'user1' }))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add user1: error ' + e.message['desc']) assert False @@ -222,7 +222,7 @@ def test_ticket47981(topology): # try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -239,7 +239,7 @@ def test_ticket47981(topology): if not entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False @@ -252,7 +252,7 @@ def test_ticket47981(topology): if entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User unexpectedly does have the pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False @@ -265,7 +265,7 @@ def test_ticket47981(topology): if not entries[0].hasAttr('pwdpolicysubentry'): log.fatal('User does not have expected pwdpolicysubentry!') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Unable to search for entry %s: error %s' % (USER_DN, e.message['desc'])) assert False diff --git a/dirsrvtests/tickets/ticket48026_test.py b/dirsrvtests/tickets/ticket48026_test.py index 5072469..f8d440f 100644 --- a/dirsrvtests/tickets/ticket48026_test.py +++ b/dirsrvtests/tickets/ticket48026_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -75,7 +75,7 @@ def test_ticket48026(topology): (ldap.MOD_ADD, 'uniqueness-attribute-name', 'mailAlternateAddress'), ]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48026: Failed to configure plugin for "mail": error ' + e.message['desc']) assert False @@ -90,7 +90,7 @@ def test_ticket48026(topology): 'mail': 'user1(a)example.com', 'mailAlternateAddress' : 'user1(a)alt.example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48026: Failed to add test user' + USER1_DN + ': error ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48109_test.py b/dirsrvtests/tickets/ticket48109_test.py index 91c1595..e4091e0 100644 --- a/dirsrvtests/tickets/ticket48109_test.py +++ b/dirsrvtests/tickets/ticket48109_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -74,14 +74,14 @@ def test_ticket48109_0(topology): (ldap.MOD_ADD, 'nsIndexType', 'sub'), (ldap.MOD_ADD, 'nsSubStrBegin', '2'), (ldap.MOD_ADD, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'auser0' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -91,7 +91,7 @@ def test_ticket48109_0(topology): 'sn': 'user0', 'givenname': 'a', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -143,7 +143,7 @@ def test_ticket48109_0(topology): (ldap.MOD_DELETE, 'nsIndexType', 'sub'), (ldap.MOD_DELETE, 'nsSubStrBegin', '2'), (ldap.MOD_DELETE, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False @@ -162,14 +162,14 @@ def test_ticket48109_1(topology): [(ldap.MOD_ADD, 'nsIndexType', 'sub'), (ldap.MOD_ADD, 'nsMatchingRule', 'nssubstrbegin=2'), (ldap.MOD_ADD, 'nsMatchingRule', 'nssubstrend=2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'buser1' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -179,7 +179,7 @@ def test_ticket48109_1(topology): 'sn': 'user1', 'givenname': 'b', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -230,7 +230,7 @@ def test_ticket48109_1(topology): [(ldap.MOD_DELETE, 'nsIndexType', 'sub'), (ldap.MOD_DELETE, 'nsMatchingRule', 'nssubstrbegin=2'), (ldap.MOD_DELETE, 'nsMatchingRule', 'nssubstrend=2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False @@ -257,14 +257,14 @@ def test_ticket48109_2(topology): (ldap.MOD_ADD, 'objectClass', 'extensibleObject'), (ldap.MOD_ADD, 'nsSubStrBegin', '2'), (ldap.MOD_ADD, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add substr lengths: error ' + e.message['desc']) assert False # restart the server to apply the indexing topology.standalone.restart(timeout=10) - # add a test user + # add a test user UID = 'cuser2' USER_DN = 'uid=%s,%s' % (UID, SUFFIX) try: @@ -274,7 +274,7 @@ def test_ticket48109_2(topology): 'sn': 'user2', 'givenname': 'c', 'mail': UID}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add ' + USER_DN + ': error ' + e.message['desc']) assert False @@ -366,7 +366,7 @@ def test_ticket48109_2(topology): (ldap.MOD_DELETE, 'objectClass', 'extensibleObject'), (ldap.MOD_DELETE, 'nsSubStrBegin', '2'), (ldap.MOD_DELETE, 'nsSubStrEnd', '2')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to delete substr lengths: error ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48191_test.py b/dirsrvtests/tickets/ticket48191_test.py index 319dab6..000975a 100644 --- a/dirsrvtests/tickets/ticket48191_test.py +++ b/dirsrvtests/tickets/ticket48191_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -142,6 +142,7 @@ def test_ticket48191_setup(topology): topology.standalone.log.info('%d entries are successfully imported.' % dnnum) + def test_ticket48191_run_0(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (no nsslapd-maxsimplepaged-per-conn) ######################\n") @@ -198,6 +199,7 @@ def test_ticket48191_run_0(topology): assert dnnum == len(entries) assert pages == (dnnum / page_size) + def test_ticket48191_run_1(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (nsslapd-maxsimplepaged-per-conn: 0) ######################\n") @@ -220,16 +222,17 @@ def test_ticket48191_run_1(topology): topology.standalone.log.fatal('Unexpected success') try: rtype, rdata, rmsgid, responcectrls = topology.standalone.result3(msgid, resp_ctrl_classes=known_ldap_resp_ctrls) - except ldap.UNWILLING_TO_PERFORM, e: + except ldap.UNWILLING_TO_PERFORM as e: topology.standalone.log.info('Returned the expected RC UNWILLING_TO_PERFORM') return - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.fatal('Unexpected error: ' + e.message['desc']) assert False topology.standalone.log.info("Type %d" % rtype) topology.standalone.log.info("%d results" % len(rdata)) assert False + def test_ticket48191_run_2(topology): topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL (nsslapd-maxsimplepaged-per-conn: 1000) ######################\n") diff --git a/dirsrvtests/tickets/ticket48214_test.py b/dirsrvtests/tickets/ticket48214_test.py index afbef22..14bf392 100644 --- a/dirsrvtests/tickets/ticket48214_test.py +++ b/dirsrvtests/tickets/ticket48214_test.py @@ -111,7 +111,7 @@ def checkMaxBerSize(topology): else: topology.standalone.log.fatal('ERROR: cn=config is not found?') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: topology.standalone.log.error('ERROR: Failed to search for user entry: ' + e.message['desc']) assert False diff --git a/dirsrvtests/tickets/ticket48228_test.py b/dirsrvtests/tickets/ticket48228_test.py index e0595bb..bb20620 100644 --- a/dirsrvtests/tickets/ticket48228_test.py +++ b/dirsrvtests/tickets/ticket48228_test.py @@ -3,7 +3,7 @@ # All rights reserved. # # License: GPL (version 3 or any later version). -# See LICENSE for details. +# See LICENSE for details. # --- END COPYRIGHT BLOCK --- # import os @@ -33,6 +33,7 @@ SUBTREE_COS_DEF = 'cn=nsPwPolicy_CoS,' + DEFAULT_SUFFIX USER1_DN = 'uid=user1,' + DEFAULT_SUFFIX USER2_DN = 'uid=user2,' + DEFAULT_SUFFIX + class TopologyStandalone(object): def __init__(self, standalone): standalone.open() @@ -77,20 +78,21 @@ def topology(request): # Here we have standalone instance up and running return TopologyStandalone(standalone) + def set_global_pwpolicy(topology, inhistory): log.info(" +++++ Enable global password policy +++++\n") topology.standalone.simple_bind_s(DN_DM, PASSWORD) # Enable password policy try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-pwpolicy-local', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False log.info(" Set global password history on\n") try: topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'passwordHistory', 'on')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set passwordHistory: error ' + e.message['desc']) assert False @@ -98,10 +100,11 @@ def set_global_pwpolicy(topology, inhistory): try: count = "%d" % inhistory topology.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'passwordInHistory', count)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set passwordInHistory: error ' + e.message['desc']) assert False + def set_subtree_pwpolicy(topology): log.info(" +++++ Enable subtree level password policy +++++\n") topology.standalone.simple_bind_s(DN_DM, PASSWORD) @@ -109,7 +112,7 @@ def set_subtree_pwpolicy(topology): try: topology.standalone.add_s(Entry((SUBTREE_CONTAINER, {'objectclass': 'top nsContainer'.split(), 'cn': 'nsPwPolicyContainer'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add subtree container: error ' + e.message['desc']) assert False @@ -124,7 +127,7 @@ def set_subtree_pwpolicy(topology): 'passwordMinAge': '0', 'passwordChange': 'on', 'passwordStorageScheme': 'clear'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add passwordpolicy: error ' + e.message['desc']) assert False @@ -135,7 +138,7 @@ def set_subtree_pwpolicy(topology): 'cosPriority': '1', 'cn': SUBTREE_COS_TMPLDN, 'pwdpolicysubentry': SUBTREE_PWP}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS template: error ' + e.message['desc']) assert False @@ -145,21 +148,23 @@ def set_subtree_pwpolicy(topology): 'cn': SUBTREE_PWPDN, 'costemplatedn': SUBTREE_COS_TMPL, 'cosAttribute': 'pwdpolicysubentry default operational-default'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to add COS def: error ' + e.message['desc']) assert False + def check_passwd_inhistory(topology, user, cpw, passwd): inhistory = 0 log.info(" Bind as {%s,%s}" % (user, cpw)) topology.standalone.simple_bind_s(user, cpw) try: topology.standalone.modify_s(user, [(ldap.MOD_REPLACE, 'userpassword', passwd)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.info(' The password ' + passwd + ' of user' + USER1_DN + ' in history: error ' + e.message['desc']) inhistory = 1 return inhistory + def update_passwd(topology, user, passwd, times): cpw = passwd loop = 0 @@ -169,7 +174,7 @@ def update_passwd(topology, user, passwd, times): cpw = 'password%d' % loop try: topology.standalone.modify_s(user, [(ldap.MOD_REPLACE, 'userpassword', cpw)]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to update the password ' + cpw + ' of user ' + user + ': error ' + e.message['desc']) assert False loop += 1 @@ -178,6 +183,7 @@ def update_passwd(topology, user, passwd, times): inhistory = check_passwd_inhistory(topology, user, cpw, passwd) assert inhistory == 1 + def test_ticket48228_test_global_policy(topology): """ Check global password policy @@ -199,7 +205,7 @@ def test_ticket48228_test_global_policy(topology): 'givenname': 'user', 'mail': 'user1(a)example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to add user' + USER1_DN + ': error ' + e.message['desc']) assert False @@ -235,6 +241,7 @@ def test_ticket48228_test_global_policy(topology): log.info("Global policy was successfully verified.") + def test_ticket48228_test_subtree_policy(topology): """ Check subtree level password policy @@ -256,7 +263,7 @@ def test_ticket48228_test_subtree_policy(topology): 'givenname': 'user', 'mail': 'user2(a)example.com', 'userpassword': 'password'}))) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('test_ticket48228: Failed to add user' + USER2_DN + ': error ' + e.message['desc']) assert False @@ -267,7 +274,7 @@ def test_ticket48228_test_subtree_policy(topology): topology.standalone.simple_bind_s(DN_DM, PASSWORD) try: topology.standalone.modify_s(SUBTREE_PWP, [(ldap.MOD_REPLACE, 'passwordInHistory', '4')]) - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.error('Failed to set pwpolicy-local: error ' + e.message['desc']) assert False @@ -297,10 +304,12 @@ def test_ticket48228_test_subtree_policy(topology): log.info("Subtree level policy was successfully verified.") + def test_ticket48228_final(topology): topology.standalone.delete() log.info('Testcase PASSED') + def run_isolated(): ''' run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) diff --git a/dirsrvtests/tickets/ticket48233_test.py b/dirsrvtests/tickets/ticket48233_test.py index 387279d..d9b0aae 100644 --- a/dirsrvtests/tickets/ticket48233_test.py +++ b/dirsrvtests/tickets/ticket48233_test.py @@ -83,7 +83,7 @@ def test_ticket48233(topology): if not entries: log.fatal('Failed return an entries from search') assert False - except ldap.LDAPError, e: + except ldap.LDAPError as e: log.fatal('Search failed: ' + e.message['desc']) assert False -- 389 commits mailing list 389-commits@%(host_name)s
http://lists.fedoraproject.org/postorius/389-commits@lists.fedoraproject.org
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
Older →
Jump to page:
1
2
3
4
5
6
7
8
Results per page:
10
25
50
100
200