PR#49861: Issue 49381 - Refactor the plugin test suite docstrings - 389-ds-base

389-ds-base

#49861 Issue 49381 - Refactor the plugin test suite docstrings

Closed 3 years ago by spichugi. Opened 5 years ago by spichugi.

spichugi/389-ds-base plugins_docs into master

Issue 49381 - Refactor the plugin test suite docstrings

Simon Pichugin • 5 years ago

c439b92

dirsrvtests/tests/suites/plugins/attr_uniqueness_test.py

file removed

-196

		`@@ -1,196 +0,0 @@`
		`- # --- BEGIN COPYRIGHT BLOCK ---`
		`- # Copyright (C) 2016 Red Hat, Inc.`
		`- # All rights reserved.`
		`- #`
		`- # License: GPL (version 3 or any later version).`
		`- # See LICENSE for details.`
		`- # --- END COPYRIGHT BLOCK ---`
		`- #`
		`- import pytest`
		`- from lib389.tasks import *`
		`- from lib389.utils import *`
		`- from lib389.topologies import topology_st`
		`- from lib389._constants import DEFAULT_SUFFIX, PLUGIN_ATTR_UNIQUENESS`
		`-`
		`- USER1_DN = 'uid=user1,' + DEFAULT_SUFFIX`
		`- USER2_DN = 'uid=user2,' + DEFAULT_SUFFIX`
		`-`
		`- logging.getLogger(__name__).setLevel(logging.DEBUG)`
		`- log = logging.getLogger(__name__)`
		`-`
		`-`
		`- def test_attr_uniqueness_init(topology_st):`
		`- '''`
		`- Enable dynamic plugins - makes things easier`
		`- '''`
		`- try:`
		`- topology_st.standalone.modify_s(DN_CONFIG, [(ldap.MOD_REPLACE, 'nsslapd-dynamic-plugins', b'on')])`
		`- except ldap.LDAPError as e:`
		`- log.fatal('Failed to enable dynamic plugin!' + e.message['desc'])`
		`- assert False`
		`-`
		`- topology_st.standalone.plugins.enable(name=PLUGIN_ATTR_UNIQUENESS)`
		`-`
		`-`
		`- def test_attr_uniqueness(topology_st):`
		`- log.info('Running test_attr_uniqueness...')`
		`-`
		`- #`
		`- # Configure plugin`
		`- #`
		`- try:`
		`- topology_st.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config',`
		`- [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', b'uid')])`
		`-`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_attr_uniqueness: Failed to configure plugin for "uid": error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # Add an entry`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER1_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '1',`
		`- 'cn': 'user 1',`
		`- 'uid': 'user1',`
		`- 'mail': 'user1@example.com',`
		`- 'mailAlternateAddress': 'user1@alt.example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_attr_uniqueness: Failed to add test user' + USER1_DN + ': error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # Add an entry with a duplicate "uid"`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'uid': 'user1',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.fatal('test_attr_uniqueness: Adding of 2nd entry(uid) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Change config to use "mail" instead of "uid"`
		`- #`
		`- try:`
		`- topology_st.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config',`
		`- [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', b'mail')])`
		`-`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_attr_uniqueness: Failed to configure plugin for "mail": error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- #`
		`- # Test plugin - Add an entry, that has a duplicate "mail" value`
		`- #`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'mail': 'user1@example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.fatal('test_attr_uniqueness: Adding of 2nd entry(mail) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Reconfigure plugin for mail and mailAlternateAddress`
		`- #`
		`- try:`
		`- topology_st.standalone.modify_s('cn=' + PLUGIN_ATTR_UNIQUENESS + ',cn=plugins,cn=config',`
		`- [(ldap.MOD_REPLACE, 'uniqueness-attribute-name', b'mail'),`
		`- (ldap.MOD_ADD, 'uniqueness-attribute-name',`
		`- b'mailAlternateAddress')])`
		`- except ldap.LDAPError as e:`
		`- log.error('test_attr_uniqueness: Failed to reconfigure plugin for "mail mailAlternateAddress": error ' +`
		`- e.message['desc'])`
		`- assert False`
		`-`
		`- #`
		`- # Test plugin - Add an entry, that has a duplicate "mail" value`
		`- #`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'mail': 'user1@example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.error('test_attr_uniqueness: Adding of 3rd entry(mail) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Test plugin - Add an entry, that has a duplicate "mailAlternateAddress" value`
		`- #`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'mailAlternateAddress': 'user1@alt.example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.error('test_attr_uniqueness: Adding of 4th entry(mailAlternateAddress) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Test plugin - Add an entry, that has a duplicate "mail" value conflicting mailAlternateAddress`
		`- #`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'mail': 'user1@alt.example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.error('test_attr_uniqueness: Adding of 5th entry(mailAlternateAddress) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Test plugin - Add an entry, that has a duplicate "mailAlternateAddress" conflicting mail`
		`- #`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER2_DN, {'objectclass': "top extensibleObject".split(),`
		`- 'sn': '2',`
		`- 'cn': 'user 2',`
		`- 'uid': 'user2',`
		`- 'mailAlternateAddress': 'user1@example.com',`
		`- 'userpassword': 'password'})))`
		`- except ldap.CONSTRAINT_VIOLATION:`
		`- pass`
		`- else:`
		`- log.error('test_attr_uniqueness: Adding of 6th entry(mail) incorrectly succeeded')`
		`- assert False`
		`-`
		`- #`
		`- # Cleanup`
		`- #`
		`- try:`
		`- topology_st.standalone.delete_s(USER1_DN)`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_attr_uniqueness: Failed to delete test entry: ' + e.message['desc'])`
		`- assert False`
		`-`
		`- log.info('test_attr_uniqueness: PASS\n')`
		`-`
		`-`
		`- if __name__ == '__main__':`
		`- # Run isolated`
		`- # -s for DEBUG mode`
		`- CURRENT_FILE = os.path.realpath(__file__)`
		`- pytest.main("-s %s" % CURRENT_FILE)`

dirsrvtests/tests/suites/plugins/dna_test.py

file removed

-168

		`@@ -1,168 +0,0 @@`
		`- # --- BEGIN COPYRIGHT BLOCK ---`
		`- # Copyright (C) 2016 Red Hat, Inc.`
		`- # All rights reserved.`
		`- #`
		`- # License: GPL (version 3 or any later version).`
		`- # See LICENSE for details.`
		`- # --- END COPYRIGHT BLOCK ---`
		`- #`
		`- import pytest`
		`- from lib389.tasks import *`
		`- from lib389.utils import *`
		`- from lib389.topologies import topology_st`
		`-`
		`- from lib389._constants import PLUGIN_DNA, DEFAULT_SUFFIX`
		`-`
		`- logging.getLogger(__name__).setLevel(logging.DEBUG)`
		`- log = logging.getLogger(__name__)`
		`-`
		`- USER1_DN = 'uid=user1,' + DEFAULT_SUFFIX`
		`- USER2_DN = 'uid=user2,' + DEFAULT_SUFFIX`
		`- USER3_DN = 'uid=user3,' + DEFAULT_SUFFIX`
		`- BUSER1_DN = 'uid=user1,ou=branch1,' + DEFAULT_SUFFIX`
		`- BUSER2_DN = 'uid=user2,ou=branch2,' + DEFAULT_SUFFIX`
		`- BUSER3_DN = 'uid=user3,ou=branch2,' + DEFAULT_SUFFIX`
		`- BRANCH1_DN = 'ou=branch1,' + DEFAULT_SUFFIX`
		`- BRANCH2_DN = 'ou=branch2,' + DEFAULT_SUFFIX`
		`- GROUP_OU = 'ou=groups,' + DEFAULT_SUFFIX`
		`- PEOPLE_OU = 'ou=people,' + DEFAULT_SUFFIX`
		`- GROUP_DN = 'cn=group,' + DEFAULT_SUFFIX`
		`- CONFIG_AREA = 'nsslapd-pluginConfigArea'`
		`-`
		`-`
		`- def test_basic(topology_st):`
		`- """Test basic functionality"""`
		`-`
		`- # Stop the plugin, and start it`
		`- topology_st.standalone.plugins.disable(name=PLUGIN_DNA)`
		`- topology_st.standalone.plugins.enable(name=PLUGIN_DNA)`
		`-`
		`- CONFIG_DN = 'cn=config,cn=' + PLUGIN_DNA + ',cn=plugins,cn=config'`
		`-`
		`- log.info('Testing ' + PLUGIN_DNA + '...')`
		`-`
		`- ############################################################################`
		`- # Configure plugin`
		`- ############################################################################`
		`-`
		`- try:`
		`- topology_st.standalone.add_s(Entry((CONFIG_DN, {`
		`- 'objectclass': 'top dnaPluginConfig'.split(),`
		`- 'cn': 'config',`
		`- 'dnatype': 'uidNumber',`
		`- 'dnafilter': '(objectclass=top)',`
		`- 'dnascope': DEFAULT_SUFFIX,`
		`- 'dnaMagicRegen': '-1',`
		`- 'dnaMaxValue': '50000',`
		`- 'dnaNextValue': '1'`
		`- })))`
		`- except ldap.ALREADY_EXISTS:`
		`- try:`
		`- topology_st.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaNextValue', b'1'),`
		`- (ldap.MOD_REPLACE, 'dnaMagicRegen', b'-1')])`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to set the DNA plugin: error ' + e.message['desc'])`
		`- assert False`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to add config entry: error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # Do we need to restart for the plugin?`
		`-`
		`- topology_st.standalone.restart()`
		`-`
		`- ############################################################################`
		`- # Test plugin`
		`- ############################################################################`
		`-`
		`- try:`
		`- topology_st.standalone.add_s(Entry((USER1_DN, {`
		`- 'objectclass': 'top extensibleObject'.split(),`
		`- 'uid': 'user1'`
		`- })))`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to user1: error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # See if the entry now has the new uidNumber assignment - uidNumber=1`
		`- try:`
		`- entries = topology_st.standalone.search_s(USER1_DN, ldap.SCOPE_BASE, '(uidNumber=1)')`
		`- if not entries:`
		`- log.fatal('test_dna: user1 was not updated - (looking for uidNumber: 1)')`
		`- assert False`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Search for user1 failed: ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # Test the magic regen value`
		`- try:`
		`- topology_st.standalone.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', b'-1')])`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # See if the entry now has the new uidNumber assignment - uidNumber=2`
		`- try:`
		`- entries = topology_st.standalone.search_s(USER1_DN, ldap.SCOPE_BASE, '(uidNumber=2)')`
		`- if not entries:`
		`- log.fatal('test_dna: user1 was not updated (looking for uidNumber: 2)')`
		`- assert False`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Search for user1 failed: ' + e.message['desc'])`
		`- assert False`
		`-`
		`- ################################################################################`
		`- # Change the config`
		`- ################################################################################`
		`-`
		`- try:`
		`- topology_st.standalone.modify_s(CONFIG_DN, [(ldap.MOD_REPLACE, 'dnaMagicRegen', b'-2')])`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to set the magic reg value to -2: error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- ################################################################################`
		`- # Test plugin`
		`- ################################################################################`
		`-`
		`- # Test the magic regen value`
		`- try:`
		`- topology_st.standalone.modify_s(USER1_DN, [(ldap.MOD_REPLACE, 'uidNumber', b'-2')])`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to set the magic reg value: error ' + e.message['desc'])`
		`- assert False`
		`-`
		`- # See if the entry now has the new uidNumber assignment - uidNumber=3`
		`- try:`
		`- entries = topology_st.standalone.search_s(USER1_DN, ldap.SCOPE_BASE, '(uidNumber=3)')`
		`- if not entries:`
		`- log.fatal('test_dna: user1 was not updated (looking for uidNumber: 3)')`
		`- assert False`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Search for user1 failed: ' + e.message['desc'])`
		`- assert False`
		`-`
		`- ############################################################################`
		`- # Test plugin dependency`
		`- ############################################################################`
		`-`
		`- # test_dependency(inst, PLUGIN_AUTOMEMBER)`
		`-`
		`- ############################################################################`
		`- # Cleanup`
		`- ############################################################################`
		`-`
		`- try:`
		`- topology_st.standalone.delete_s(USER1_DN)`
		`- except ldap.LDAPError as e:`
		`- log.fatal('test_dna: Failed to delete test entry1: ' + e.message['desc'])`
		`- assert False`
		`-`
		`- topology_st.standalone.plugins.disable(name=PLUGIN_DNA)`
		`-`
		`-`
		`- if __name__ == '__main__':`
		`- # Run isolated`
		`- # -s for DEBUG mode`
		`- CURRENT_FILE = os.path.realpath(__file__)`
		`- pytest.main("-s %s" % CURRENT_FILE)`

dirsrvtests/tests/suites/plugins/memberof_test.py

file modified

+670 -399

		`@@ -43,6 +43,7 @@`
		`def _get_user_rdn(ext):`
		`return ensure_bytes("uid=%s_%s" % (USER_RDN, ext))`

		`+`
		`def _get_user_dn(ext):`
		`return ensure_bytes("%s,%s" % (ensure_str(_get_user_rdn(ext)), USERS_CONTAINER))`

		`@@ -102,7 +103,6 @@`
		`return found`


		`-`
		`def _check_memberof(topology_st, member, group):`
		`log.info("Lookup memberof from %s" % member)`
		`entry = topology_st.standalone.getEntry(ensure_str(member), ldap.SCOPE_BASE, '(objectclass=*)', ['memberof'])`
		`@@ -119,24 +119,19 @@`
		`return found`


		`- def text_memberof_683241_01(topology_st):`
		`- """`
		`- Test Modify the memberof plugin to use the new type`
		`- """`
		`- topology_st.standalone.modify_s(MEMBEROF_PLUGIN_DN,`
		`- [(ldap.MOD_REPLACE,`
		`- PLUGIN_TYPE,`
		`- b'betxnpostoperation')])`
		`- topology_st.standalone.restart()`
		`- ent = topology_st.standalone.getEntry(MEMBEROF_PLUGIN_DN, ldap.SCOPE_BASE, "(objectclass=*)", [PLUGIN_TYPE])`
		`- assert ent.hasAttr(PLUGIN_TYPE)`
		`- assert ent.getValue(PLUGIN_TYPE) == 'betxnpostoperation'`
		`-`
		`+ def test_betxnpostoperation_replace(topology_st):`
		`+ """Test modify the memberof plugin operation to use the new type`

		`- def text_memberof_683241_01(topology_st):`
		`- """`
		`- Test Modify the memberof plugin to use the new type`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a91`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Set plugin type to betxnpostoperation`
		`+ 2. Check is was changed`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`"""`
		`+`
		`topology_st.standalone.modify_s(MEMBEROF_PLUGIN_DN,`
		`[(ldap.MOD_REPLACE,`
		`PLUGIN_TYPE,`
		`@@ -144,13 +139,22 @@`
		`topology_st.standalone.restart()`
		`ent = topology_st.standalone.getEntry(MEMBEROF_PLUGIN_DN, ldap.SCOPE_BASE, "(objectclass=*)", [PLUGIN_TYPE])`
		`assert ent.hasAttr(PLUGIN_TYPE)`
		`- assert ent.getValue(PLUGIN_TYPE) == 'betxnpostoperation'`
		`+ assert ent.getValue(PLUGIN_TYPE) == b'betxnpostoperation'`


		`- def test_memberof_MultiGrpAttr_001(topology_st):`
		`- """`
		`- Checking multiple grouping attributes supported`
		`+ def test_memberofgroupattr_add(topology_st):`
		`+ """Check multiple grouping attributes supported`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a92`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Add memberofgroupattr - 'uniqueMember'`
		`+ 2. Check we have 'uniqueMember' and 'member' values`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`"""`
		`+`
		`_set_memberofgroupattr_add(topology_st, 'uniqueMember')`
		`ent = topology_st.standalone.getEntry(MEMBEROF_PLUGIN_DN, ldap.SCOPE_BASE, "(objectclass=*)",`
		`[PLUGIN_MEMBEROF_GRP_ATTR])`
		`@@ -159,10 +163,19 @@`
		`assert b'uniqueMember'.lower() in [x.lower() for x in ent.getValues(PLUGIN_MEMBEROF_GRP_ATTR)]`


		`- def test_memberof_MultiGrpAttr_003(topology_st):`
		`- """`
		`- Check the plug-in is started`
		`+ def test_enable(topology_st):`
		`+ """Check the plug-in is started`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a93`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Enable the plugin`
		`+ 2. Restart the instance`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Server should start and plugin should be on`
		`"""`
		`+`
		`log.info("Enable MemberOf plugin")`
		`topology_st.standalone.plugins.enable(name=PLUGIN_MEMBER_OF)`
		`topology_st.standalone.restart()`
		`@@ -171,10 +184,21 @@`
		`assert ent.getValue(PLUGIN_ENABLED).lower() == b'on'`


		`- def test_memberof_MultiGrpAttr_004(topology_st):`
		`- """`
		`- MemberOf attribute should be successfully added to both the users`
		`+ def test_member_add(topology_st):`
		`+ """MemberOf attribute should be successfully added to both the users`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a94`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Create user and groups`
		`+ 2. Add the users as members to the groups`
		`+ 3. Check the membership`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`"""`
		`+`
		`memofenh1 = _create_user(topology_st, 'memofenh1')`
		`memofenh2 = _create_user(topology_st, 'memofenh2')`

		`@@ -199,10 +223,19 @@`
		`assert _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`


		`- def test_memberof_MultiGrpAttr_005(topology_st):`
		`- """`
		`- Partial removal of memberofgroupattr: removing member attribute from Group1`
		`+ def test_member_delete_gr1(topology_st):`
		`+ """Partial removal of memberofgroupattr: removing member attribute from Group1`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a95`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Delete a member: enh1 in grp1`
		`+ 2. Check the states of the members were changed accordingly`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -221,10 +254,19 @@`
		`assert _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`


		`- def test_memberof_MultiGrpAttr_006(topology_st):`
		`- """`
		`- Partial removal of memberofgroupattr: removing uniqueMember attribute from Group2`
		`+ def test_member_delete_gr2(topology_st):`
		`+ """Partial removal of memberofgroupattr: removing uniqueMember attribute from Group2`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a96`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Delete a uniqueMember: enh2 in grp2`
		`+ 2. Check the states of the members were changed accordingly`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -244,10 +286,19 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`


		`- def test_memberof_MultiGrpAttr_007(topology_st):`
		`- """`
		`- Complete removal of memberofgroupattr`
		`+ def test_member_delete_all(topology_st):`
		`+ """Complete removal of memberofgroupattr`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a97`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Delete the rest of the members`
		`+ 2. Check the states of the members were changed accordingly`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -271,10 +322,21 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`


		`- def test_memberof_MultiGrpAttr_008(topology_st):`
		`- """`
		`- MemberOf attribute should be present on both the users`
		`+ def test_member_after_restart(topology_st):`
		`+ """MemberOf attribute should be present on both the users`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a98`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Add a couple of members to the groups`
		`+ 2. Restart the instance`
		`+ 3. Check the states of the members were changed accordingly`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -317,10 +379,17 @@`
		`topology_st.standalone.restart()`


		`- def test_memberof_MultiGrpAttr_009(topology_st):`
		`- """`
		`- MemberOf attribute should not be added to the user since memberuid is not a DN syntax attribute`
		`+ def test_memberofgroupattr_uid(topology_st):`
		`+ """MemberOf attribute should not be added to the user since memberuid is not a DN syntax attribute`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a99`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Try to add memberUid to the group`
		`+ :expectedresults:`
		`+ 1. It should fail with Unwilling to perform error`
		`"""`
		`+`
		`try:`
		`_set_memberofgroupattr_add(topology_st, 'memberUid')`
		`log.error("Setting 'memberUid' as memberofgroupattr should be rejected")`
		`@@ -330,16 +399,19 @@`
		`assert True`


		`- def test_memberof_MultiGrpAttr_010(topology_st):`
		`- """`
		`- Duplicate member attribute to groups`
		`+ def test_member_add_duplicate_usr1(topology_st):`
		`+ """Duplicate member attribute to groups`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a10`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Try to add a member: enh1 which already exists`
		`+ :expectedresults:`
		`+ 1. It should fail with Type of value exists error`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`- memofenh2 = _get_user_dn('memofenh2')`
		`-`
		`memofegrp1 = _get_group_dn('memofegrp1')`
		`- memofegrp2 = _get_group_dn('memofegrp2')`

		`# assert enh1 is member of grp1`
		`assert _check_memberof(topology_st, member=memofenh1, group=memofegrp1)`
		`@@ -356,17 +428,15 @@`
		`assert True`


		`- def test_memberof_MultiGrpAttr_011(topology_st):`
		`- """`
		`- Duplicate uniqueMember attributes to groups`
		`-`
		`- At the beginning:`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`+ def test_member_add_duplicate_usr2(topology_st):`
		`+ """Duplicate uniqueMember attributes to groups`

		`- At the end`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a11`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Try to add a uniqueMember: enh2 which already exists`
		`+ :expectedresults:`
		`+ 1. It should fail with Type of value exists error`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -405,63 +475,75 @@`
		`assert _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`


		`- def test_memberof_MultiGrpAttr_012(topology_st):`
		`- """`
		`- MemberURL attritbute should reflect the modrdn changes in the group.`
		`-`
		`- This test has been covered in MODRDN test suite`
		`-`
		`- At the beginning:`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`-`
		`- At the end`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`- """`
		`- pass`
		`-`
		`-`
		`- def test_memberof_MultiGrpAttr_013(topology_st):`
		`- """`
		`- MemberURL attritbute should reflect the modrdn changes in the group.`
		`-`
		`- This test has been covered in MODRDN test suite`
		`-`
		`- At the beginning:`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`-`
		`- At the end`
		`- memofenh1 is memberof memofegrp1`
		`- memofenh2 is memberof memofegrp2`
		`- """`
		`- pass`
		`+ #def test_memberof_MultiGrpAttr_012(topology_st):`
		`+ # """`
		`+ # MemberURL attritbute should reflect the modrdn changes in the group.`
		`+ #`
		`+ # This test has been covered in MODRDN test suite`
		`+ #`
		`+ # At the beginning:`
		`+ # memofenh1 is memberof memofegrp1`
		`+ # memofenh2 is memberof memofegrp2`
		`+ #`
		`+ # At the end`
		`+ # memofenh1 is memberof memofegrp1`
		`+ # memofenh2 is memberof memofegrp2`
		`+ # """`
		`+ # pass`


		`- def test_memberof_MultiGrpAttr_014(topology_st):`
		`- """`
		`- Both member and uniqueMember pointing to the same user`
		`+ #def test_memberof_MultiGrpAttr_013(topology_st):`
		`+ # """`
		`+ # MemberURL attritbute should reflect the modrdn changes in the group.`
		`+ #`
		`+ # This test has been covered in MODRDN test suite`
		`+ #`
		`+ # At the beginning:`
		`+ # memofenh1 is memberof memofegrp1`
		`+ # memofenh2 is memberof memofegrp2`
		`+ #`
		`+ # At the end`
		`+ # memofenh1 is memberof memofegrp1`
		`+ # memofenh2 is memberof memofegrp2`
		`+ # """`
		`+ # pass`

		`- At the beginning:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`

		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`+ def test_member_uniquemember_same_user(topology_st):`
		`+ """Check the situation when both member and uniqueMember`
		`+ pointing to the same user`

		`- At the end`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a13`
		`+ :setup: Standalone instance, grp3,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- - grp3 (uniquemember)`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- - grp3 (member)`
		`+ :steps:`
		`+ 1. Add member: enh1 and uniqueMember: enh1 to grp3`
		`+ 2. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (member uniquemember)`
		`+ 3. Delete member: enh1 from grp3`
		`+ 4. Add member: enh2 to grp3`
		`+ 5. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ 6. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -512,7 +594,7 @@`

		`# assert enh2 is member of`
		`# - not grp1`
		`- # - not grp2 (uniquemember)`
		`+ # - grp2 (uniquemember)`
		`# - grp3 (member)`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp1)`
		`assert _check_memberof(topology_st, member=memofenh2, group=memofegrp2)`
		`@@ -544,33 +626,35 @@`
		`assert _check_memberof(topology_st, member=memofenh2, group=memofegrp3)`


		`- def test_memberof_MultiGrpAttr_015(topology_st):`
		`- """`
		`- Non-existing users to member attribut`
		`+ def test_member_not_exists(topology_st):`
		`+ """Check the situation when we add non-existing users to member attribute`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a14`
		`+ :setup: Standalone instance, grp015,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`-`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`-`
		`- At the end:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp015`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- - not grp015`
		`+ :steps:`
		`+ 1. Add member: dummy1 and uniqueMember: dummy2 to grp015`
		`+ 2. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp015`
		`+ 3. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp015`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -634,37 +718,55 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp015)`


		`- def test_memberof_MultiGrpAttr_016(topology_st):`
		`- """`
		`- ldapmodify non-existing users to the member attribute`
		`+ def test_member_not_exists_complex(topology_st):`
		`+ """Check the situation when we modify non-existing users member attribute`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a15`
		`+ :setup: Standalone instance,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`-`
		`- At the end:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp015`
		`- - grp016 (member uniquemember)`
		`-`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`- - not grp015`
		`- - not grp016`
		`+ :steps:`
		`+ 1. Add member: enh1 and uniqueMember: enh1 to grp016`
		`+ 2. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ 3. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ 4. Add member: dummy1 and uniqueMember: dummy2 to grp016`
		`+ 5. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ 6. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -772,67 +874,74 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp016)`


		`- def test_memberof_MultiGrpAttr_017(topology_st):`
		`- """`
		`- Add user1 and user2 as memberof grp017`
		`+ def test_complex_group_scenario_1(topology_st):`
		`+ """Check the situation when user1 and user2 are memberof grp017`
		`user2 is member of grp017 but not with a memberof attribute (memberUid)`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a16`
		`+ :setup: Standalone instance, grp017,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`- grp016 (member uniquemember)`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`- not grp016`
		`-`
		`- At the end:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp015`
		`- - grp016 (member uniquemember)`
		`- - not grp17`
		`-`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`- - not grp015`
		`- - not grp016`
		`- - not grp017`
		`-`
		`- user1 is member of`
		`- - not grp1`
		`- - not grp2`
		`- - not grp3`
		`- - not grp015`
		`- - not grp016`
		`- - grp017 (member)`
		`-`
		`- user2 is member of`
		`- - not grp1`
		`- - not grp2`
		`- - not grp3`
		`- - not grp015`
		`- - not grp016`
		`- - grp017 (uniquemember)`
		`-`
		`- user3 is member of`
		`- - not grp1`
		`- - not grp2`
		`- - not grp3`
		`- - not grp015`
		`- - not grp016`
		`- - not grp017 (memberuid)`
		`+ :steps:`
		`+ 1. Create user1 as grp17 (member)`
		`+ 2. Create user2 as grp17 (uniqueMember)`
		`+ 3. Create user3 as grp17 (memberuid) (not memberof attribute)`
		`+ 4. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ - not grp17`
		`+ 5. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp17`
		`+ 6. Assert user1 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - grp17 (member)`
		`+ 7. Assert user2 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - grp17 (uniqueMember)`
		`+ 8. Assert user3 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - NOT grp17 (memberuid)`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`+ 8. Success`
		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -973,68 +1082,89 @@`
		`assert not _check_memberof(topology_st, member=memofuser3, group=memofegrp017)`


		`- def test_memberof_MultiGrpAttr_018(topology_st):`
		`- """`
		`- Add user1 and user2 as memberof grp018`
		`+ def test_complex_group_scenario_2(topology_st):`
		`+ """Check the situation when user1 and user2 are memberof grp018`
		`user2 is member of grp018 but not with a memberof attribute (memberUid)`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a17`
		`+ :setup: Standalone instance, grp018,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`- grp016 (member uniquemember)`
		`- not grp17`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`- not grp016`
		`- not grp017`
		`-`
		`- user1 is member of`
		`+ user1 is member of`
		`- not grp1`
		`- not grp2`
		`- not grp3`
		`- not grp015`
		`- not grp016`
		`- grp017 (member)`
		`-`
		`- user2 is member of`
		`+ user2 is member of`
		`- not grp1`
		`- not grp2`
		`- not grp3`
		`- not grp015`
		`- not grp016`
		`- grp017 (uniquemember)`
		`-`
		`- user3 is member of`
		`+ user3 is member of`
		`- not grp1`
		`- not grp2`
		`- not grp3`
		`- not grp015`
		`- not grp016`
		`- not grp017 (memberuid)`
		`-`
		`- At the end:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp015`
		`- - grp016 (member uniquemember)`
		`- - not grp018`
		`-`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`- - not grp015`
		`- - not grp016`
		`- - not grp018`
		`+ :steps:`
		`+ 1. Add user1 as a member of grp18 (member, uniquemember)`
		`+ 2. Assert user1 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - grp17 (member)`
		`+ - grp18 (member, uniquemember)`
		`+ 3. Delete user1 member/uniquemember attributes from grp018`
		`+ 4. Assert user1 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - grp17 (member)`
		`+ - NOT grp18 (memberUid)`
		`+ 5. Delete user1, user2, user3, grp17 entries`
		`+ 6. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ - not grp018`
		`+ 7. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -1203,46 +1333,112 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp018)`


		`- def test_memberof_MultiGrpAttr_019(topology_st):`
		`- """`
		`- Add user2 to grp19_2`
		`- Add user3 to grp19_3`
		`+ def test_complex_group_scenario_3(topology_st):`
		`+ """Test a complex memberOf case:`
		`+ Add user2 to grp19_2,`
		`+ Add user3 to grp19_3,`
		`Add grp19_2 and grp_19_3 to grp19_1`

		`- At the beginning:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp015`
		`- - grp016 (member uniquemember)`
		`- - not grp018`
		`-`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`- - not grp015`
		`- - not grp016`
		`- - not grp018`
		`- At the end:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a18`
		`+ :setup: Standalone instance,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`- grp016 (member uniquemember)`
		`- not grp018`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`- not grp016`
		`- not grp018`
		`+ :steps:`
		`+ 1. Create user2 and user3`
		`+ 2. Create a group grp019_2 with user2 member`
		`+ 3. Create a group grp019_3 with user3 member`
		`+ 4. Create a group grp019_1 with memofegrp019_2, memofegrp019_3 member`
		`+ 5. Assert memofegrp019_1 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - not grp19_1`
		`+ - not grp019_2`
		`+ - not grp019_3`

		`-`
		`+ 6. Assert memofegrp019_2 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - grp19_1`
		`+ - not grp019_2`
		`+ - not grp019_3`
		`+ 7. Assert memofegrp019_3 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - grp19_1`
		`+ - not grp019_2`
		`+ - not grp019_3`
		`+ 8. Assert memofuser2 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - grp19_1`
		`+ - grp019_2`
		`+ - not grp019_3`
		`+ 9. Assert memofuser3 is member of`
		`+ - not grp1`
		`+ - not grp2`
		`+ - not grp3`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - grp19_1`
		`+ - not grp019_2`
		`+ - grp019_3`
		`+ 10. Delete user2, user3, and all grp19* entries`
		`+ 11. Assert enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ - not grp018`
		`+ 12. Assert enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`+ 8. Success`
		`+ 9. Success`
		`+ 10. Success`
		`+ 11. Success`
		`+ 12. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -1441,32 +1637,43 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp018)`


		`- def test_memberof_MultiGrpAttr_020(topology_st):`
		`- """`
		`+ def test_complex_group_scenario_4(topology_st):`
		`+ """Test a complex memberOf case:`
		`Add user1 and grp[1-5]`
		`Add user1 member of grp[1-4]`
		`Add grp[1-4] member of grp5`
		`Check user1 is member of grp[1-5]`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d223af17-17a6-48a0-8f22-a38306726a19`
		`+ :setup: Standalone instance,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`- grp016 (member uniquemember)`
		`- not grp018`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`- not grp016`
		`- not grp018`
		`-`
		`- At the end:`
		`- Idem`
		`+ :steps:`
		`+ 1. Create user1`
		`+ 2. Create grp[1-5] that can be inetUser (having memberof)`
		`+ 3. Add user1 to grp[1-4] (uniqueMember)`
		`+ 4. Create grp5 with grp[1-4] as member`
		`+ 5. Assert user1 is a member grp[1-5]`
		`+ 6. Delete user1 and all grp20 entries`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -1543,36 +1750,43 @@`
		`topology_st.standalone.delete_s(ensure_str(grp))`


		`- def test_memberof_MultiGrpAttr_021(topology_st):`
		`- """`
		`+ def test_complex_group_scenario_5(topology_st):`
		`+ """Test a complex memberOf case:`
		`Add user[1-4] and Grp[1-4]`
		`Add userX as uniquemember of GrpX`
		`- ADD Grp5`
		`+ Add Grp5`
		`Grp[1-4] as members of Grp5`
		`user1 as member of Grp5`
		`Check that user1 is member of Grp1 and Grp5`
		`- check that user* are members of Grp5`
		`+ Check that user* are members of Grp5`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a20`
		`+ :setup: Standalone instance,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`- not grp015`
		`- grp016 (member uniquemember)`
		`- not grp018`
		`-`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`- not grp015`
		`- not grp016`
		`- not grp018`
		`-`
		`- At the end:`
		`-`
		`- enh1 is member of`
		`+ :steps:`
		`+ 1. Create user1-4`
		`+ 2. Create grp[1-4] that can be inetUser (having memberof)`
		`+ 3. Add userX (uniquemember) to grpX`
		`+ 4. Create grp5 with grp[1-4] as member + user1`
		`+ 5. Assert user[1-4] are member of grp20_5`
		`+ 6. Assert userX is uniqueMember of grpX`
		`+ 7. Check that user[1-4] is only 'uniqueMember' of the grp20_[1-4]`
		`+ 8. Check that grp20_[1-4] are only 'member' of grp20_5`
		`+ 9. Check that user1 are only 'member' of grp20_5`
		`+ 10. Assert enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`@@ -1580,7 +1794,7 @@`
		`- grp16 (member uniquemember)`
		`- not grp018`
		`- not grp20*`
		`- enh2 is member of`
		`+ 11. Assert enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`@@ -1588,11 +1802,18 @@`
		`- not grp16`
		`- not grp018`
		`- not grp20*`
		`-`
		`- user1 is member of grp20_5`
		`- userX is uniquemember of grp20_X`
		`- grp[1-4] are member of grp20_5`
		`-`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`+ 8. Success`
		`+ 9. Success`
		`+ 10. Success`
		`+ 11. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -1727,38 +1948,40 @@`
		`assert not _check_memberof(topology_st, member=memofenh2, group=memofegrp020_5)`


		`- def test_memberof_MultiGrpAttr_022(topology_st):`
		`- """`
		`+ def test_complex_group_scenario_6(topology_st):`
		`+ """Test a complex memberOf case:`
		`add userX as member/uniqueMember of GrpX`
		`add Grp5 as uniquemember of GrpX (this create a loop)`

		`-`
		`- At the beginning:`
		`- enh1 is member of`
		`- - grp1 (member)`
		`- - not grp2`
		`- - grp3 (uniquemember)`
		`- - not grp15`
		`- - grp16 (member uniquemember)`
		`- - not grp018`
		`- - not grp20*`
		`- enh2 is member of`
		`- - not grp1`
		`- - grp2 (uniquemember)`
		`- - grp3 (member)`
		`- - not grp15`
		`- - not grp16`
		`- - not grp018`
		`- - not grp20*`
		`-`
		`-`
		`- user1 is member of grp20_5`
		`- userX is uniquemember of grp20_X`
		`- grp[1-4] are member of grp20_5`
		`-`
		`- At the end:`
		`-`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a21`
		`+ :setup: Standalone instance`
		`+ enh1 is member of`
		`+ - grp1 (member)`
		`+ - not grp2`
		`+ - grp3 (uniquemember)`
		`+ - not grp15`
		`+ - grp16 (member uniquemember)`
		`+ - not grp018`
		`+ - not grp20*`
		`+ enh2 is member of`
		`+ - not grp1`
		`+ - grp2 (uniquemember)`
		`+ - grp3 (member)`
		`+ - not grp15`
		`+ - not grp16`
		`+ - not grp018`
		`+ - not grp20*`
		`+ user1 is member of grp20_5`
		`+ userX is uniquemember of grp20_X`
		`+ grp[1-4] are member of grp20_5`
		`+ :steps:`
		`+ 1. Add user[1-4] (member) to grp020_[1-4]`
		`+ 2. Check that user[1-4] are 'member' and 'uniqueMember' of the grp20_[1-4]`
		`+ 3. Add Grp[1-4] (uniqueMember) to grp5`
		`+ 4. Assert user[1-4] are member of grp20_[1-4]`
		`+ 5. Assert that all groups are members of each others because Grp5 is member of all grp20_[1-4]`
		`+ 6. Assert user[1-5] is uniqueMember of grp[1-5]`
		`+ 7. Assert enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`@@ -1766,7 +1989,7 @@`
		`- grp16 (member uniquemember)`
		`- not grp018`
		`- not grp20*`
		`- enh2 is member of`
		`+ 8. Assert enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`@@ -1774,11 +1997,15 @@`
		`- not grp16`
		`- not grp018`
		`- not grp20*`
		`-`
		`- grp[1-4] are member of grp20_5`
		`- user1 is member (member) of group_5`
		`- grp5 is uniqueMember of grp20_[1-4]`
		`- user[1-4] is member/uniquemember of grp20_[1-4]`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`+ 8. Success`
		`"""`

		`memofenh1 = _get_user_dn('memofenh1')`
		`@@ -2009,13 +2236,12 @@`
		`assert _check_memberof(topology_st, member=memofuser1, group=grp)`


		`- def test_memberof_MultiGrpAttr_023(topology_st):`
		`- """`
		`-`
		`-`
		`+ def test_complex_group_scenario_7(topology_st):`
		`+ """Check the user removal from the complex membership topology`

		`- At the beginning:`
		`- enh1 is member of`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a22`
		`+ :setup: Standalone instance,`
		`+ enh1 is member of`
		`- grp1 (member)`
		`- not grp2`
		`- grp3 (uniquemember)`
		`@@ -2023,7 +2249,7 @@`
		`- grp16 (member uniquemember)`
		`- not grp018`
		`- not grp20*`
		`- enh2 is member of`
		`+ enh2 is member of`
		`- not grp1`
		`- grp2 (uniquemember)`
		`- grp3 (member)`
		`@@ -2031,41 +2257,35 @@`
		`- not grp16`
		`- not grp018`
		`- not grp20*`
		`-`
		`grp[1-4] are member of grp20_5`
		`user1 is member (member) of group_5`
		`grp5 is uniqueMember of grp20_[1-4]`
		`user[1-4] is member/uniquemember of grp20_[1-4]`
		`-`
		`- /----member ---> G1 ---member/uniqueMember -\`
		`- /<--uniquemember- V`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2 ---member/uniqueMember -> U2`
		`- \|<--uniquemember-/`
		`- \|`
		`- \|----member ---> G3 ---member/uniqueMember -> U3`
		`- \|<--uniquemember-/`
		`- \|----member ---> G4 ---member/uniqueMember -> U4`
		`- \|<--uniquemember-/`
		`-`
		`-`
		`-`
		`-`
		`- At the end:`
		`- /----member ---> G1 ---uniqueMember -------\`
		`- / V`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2 ---member/uniqueMember -> U2`
		`- \|<--uniquemember-/`
		`- \|`
		`- \|----member ---> G3 ---member/uniqueMember -> U3`
		`- \|<--uniquemember-/`
		`- \|----member ---> G4 ---member/uniqueMember -> U4`
		`- \|<--uniquemember-/`
		`+ :steps:`
		`+ 1. Delete user1 as 'member' of grp20_1`
		`+ 2. Delete grp020_5 as 'uniqueMember' of grp20_1`
		`+ 3. Check the result membership`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. The result should be like this`
		`+`
		`+ ::`
		`+`
		`+ /----member ---> G1 ---uniqueMember -------\`
		`+ / V`
		`+ G5 ------------------------>member ---------- --->U1`
		`+ \|`
		`+ \|----member ---> G2 ---member/uniqueMember -> U2`
		`+ \|<--uniquemember-/`
		`+ \|`
		`+ \|----member ---> G3 ---member/uniqueMember -> U3`
		`+ \|<--uniquemember-/`
		`+ \|----member ---> G4 ---member/uniqueMember -> U4`
		`+ \|<--uniquemember-/`

		`"""`
		`+`
		`memofenh1 = _get_user_dn('memofenh1')`
		`memofenh2 = _get_user_dn('memofenh2')`

		`@@ -2240,35 +2460,47 @@`
		`assert _check_memberof(topology_st, member=memofuser1, group=grp)`


		`- def test_memberof_MultiGrpAttr_024(topology_st):`
		`- """`
		`- At the beginning:`
		`+ def test_complex_group_scenario_8(topology_st):`
		`+ """Check the user add operation to the complex membership topology`

		`+ :id: d222af17-17a6-48a0-8f22-a38306726a23`
		`+ :setup: Standalone instance,`

		`- /----member ---> G1 ---uniqueMember -------\`
		`- / V`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2 ---member/uniqueMember -> U2`
		`- \|<--uniquemember-/`
		`- \|`
		`- \|----member ---> G3 ---member/uniqueMember -> U3`
		`- \|<--uniquemember-/`
		`- \|----member ---> G4 ---member/uniqueMember -> U4`
		`- \|<--uniquemember-/`
		`+ ::`
		`+`
		`+ /----member ---> G1 ---uniqueMember -------\`
		`+ / V`
		`+ G5 ------------------------>member ---------- --->U1`
		`+ \|`
		`+ \|----member ---> G2 ---member/uniqueMember -> U2`
		`+ \|<--uniquemember-/`
		`+ \|`
		`+ \|----member ---> G3 ---member/uniqueMember -> U3`
		`+ \|<--uniquemember-/`
		`+ \|----member ---> G4 ---member/uniqueMember -> U4`
		`+ \|<--uniquemember-/`
		`+`
		`+ :steps:`
		`+ 1. Add user1 to grp020_1`
		`+ 2. Check the result membership`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. The result should be like this`
		`+`
		`+ ::`
		`+`
		`+ /----member ---> G1 ---member/uniqueMember -\`
		`+ / V`
		`+ G5 ------------------------>member ---------- --->U1`
		`+ \|`
		`+ \|----member ---> G2 ---member/uniqueMember -> U2`
		`+ \|<--uniquemember-/`
		`+ \|`
		`+ \|----member ---> G3 ---member/uniqueMember -> U3`
		`+ \|<--uniquemember-/`
		`+ \|----member ---> G4 ---member/uniqueMember -> U4`
		`+ \|<--uniquemember-/`

		`- At the end:`
		`- /----member ---> G1 ---member/uniqueMember -\`
		`- / V`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2 ---member/uniqueMember -> U2`
		`- \|<--uniquemember-/`
		`- \|`
		`- \|----member ---> G3 ---member/uniqueMember -> U3`
		`- \|<--uniquemember-/`
		`- \|----member ---> G4 ---member/uniqueMember -> U4`
		`- \|<--uniquemember-/`
		`"""`

		`memofuser1 = _get_user_dn('memofuser1')`
		`@@ -2327,30 +2559,42 @@`
		`assert not _check_memberof(topology_st, member=user, group=grp)`


		`- def test_memberof_MultiGrpAttr_025(topology_st):`
		`- """`
		`- At the beginning:`
		`+ def test_complex_group_scenario_9(topology_st):`
		`+ """Check the massive user deletion from the complex membership topology`

		`+ :id: d222af17-17a6-48a0-8f22-a38306726a24`
		`+ :setup: Standalone instance,`

		`- /----member ---> G1 ---member/uniqueMember -\`
		`- / V`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2 ---member/uniqueMember -> U2`
		`- \|<--uniquemember-/`
		`- \|`
		`- \|----member ---> G3 ---member/uniqueMember -> U3`
		`- \|<--uniquemember-/`
		`- \|----member ---> G4 ---member/uniqueMember -> U4`
		`- \|<--uniquemember-/`
		`- At the end:`
		`- /----member ---> G1`
		`- /`
		`- G5 ------------------------>member ---------- --->U1`
		`- \|`
		`- \|----member ---> G2`
		`- \|----member ---> G3`
		`- \|----member ---> G4`
		`+ ::`
		`+`
		`+ /----member ---> G1 ---member/uniqueMember -\`
		`+ / V`
		`+ G5 ------------------------>member ---------- --->U1`
		`+ \|`
		`+ \|----member ---> G2 ---member/uniqueMember -> U2`
		`+ \|<--uniquemember-/`
		`+ \|`
		`+ \|----member ---> G3 ---member/uniqueMember -> U3`
		`+ \|<--uniquemember-/`
		`+ \|----member ---> G4 ---member/uniqueMember -> U4`
		`+ \|<--uniquemember-/`
		`+`
		`+ :steps:`
		`+ 1. Delete user[1-5] as 'member' and 'uniqueMember' from grp20_[1-5]`
		`+ 2. Check the result membership`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. The result should be like this`
		`+`
		`+ ::`
		`+`
		`+ /----member ---> G1`
		`+ /`
		`+ G5 ------------------------>member ---------- --->U1`
		`+ \|`
		`+ \|----member ---> G2`
		`+ \|----member ---> G3`
		`+ \|----member ---> G4`

		`"""`

		`@@ -2411,8 +2655,35 @@`


		`def test_memberof_auto_add_oc(topology_st):`
		`- """Test the auto add objectclass feature. The plugin should add a predefined`
		`+ """Test the auto add objectclass (OC) feature. The plugin should add a predefined`
		`objectclass that will allow memberOf to be added to an entry.`
		`+`
		`+ :id: d222af17-17a6-48a0-8f22-a38306726a25`
		`+ :setup: Standalone instance`
		`+ :steps:`
		`+ 1. Enable dynamic plugins`
		`+ 2. Enable memberOf plugin`
		`+ 3. Test that the default add OC works.`
		`+ 4. Add a group that already includes one user`
		`+ 5. Assert memberOf on user1`
		`+ 6. Delete user1 and the group`
		`+ 7. Test invalid value (config validation)`
		`+ 8. Add valid objectclass`
		`+ 9. Add two users`
		`+ 10. Add a group that already includes one user`
		`+ 11. Add a user to the group`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Success`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ 6. Success`
		`+ 7. Success`
		`+ 8. Success`
		`+ 9. Success`
		`+ 10. Success`
		`+ 11. Success`
		`"""`

		`# enable dynamic plugins`

dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py

file modified

+2 -2

		`@@ -19,7 +19,7 @@`

		`@pytest.mark.ds47384`
		`def test_pluginpath_validation(topology_st):`
		`- '''Test pluginpath validation: relative and absolute paths`
		`+ """Test pluginpath validation: relative and absolute paths`
		`With the inclusion of ticket 47601 - we do allow plugin paths`
		`outside the default location`

		`@@ -40,7 +40,7 @@`
		`3. This should pass`
		`4. This should fail`
		`5. This should fail`
		`- '''`
		`+ """`

		`if os.geteuid() != 0:`
		`log.warn('This script must be run as root')`

dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py

file modified

+167 -46

		`@@ -24,21 +24,21 @@`
		`USER1_DN = 'uid=user1,' + DEFAULT_SUFFIX`


		`- def test_rootdn_init(topology_st):`
		`- '''`
		`- Initialize our setup to test the ROot DN Access Control Plugin`
		`+ @pytest.fixture(scope="module")`
		`+ def rootdn_setup(topology_st):`
		`+ """Initialize our setup to test the Root DN Access Control Plugin`

		`- Test the following access control type:`
		`+ Test the following access control type:`

		`- - Allowed IP address *`
		`- - Denied IP address *`
		`- - Specific time window`
		`- - Days allowed access`
		`- - Allowed host *`
		`- - Denied host *`
		`+ - Allowed IP address *`
		`+ - Denied IP address *`
		`+ - Specific time window`
		`+ - Days allowed access`
		`+ - Allowed host *`
		`+ - Denied host *`

		`- * means mulitple valued`
		`- '''`
		`+ * means mulitple valued`
		`+ """`

		`log.info('Initializing root DN test suite...')`

		`@@ -83,10 +83,24 @@`
		`log.info('test_rootdn_init: Initialized root DN test suite.')`


		`- def test_rootdn_access_specific_time(topology_st):`
		`- '''`
		`- Test binding inside and outside of a specific time`
		`- '''`
		`+ def test_rootdn_access_specific_time(topology_st, rootdn_setup):`
		`+ """Test binding inside and outside of a specific time`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e8`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Get the current time, and bump it ahead twohours`
		`+ 2. Bind as Root DN`
		`+ 3. Set config to allow the entire day`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_specific_time...')`

		`@@ -165,10 +179,24 @@`
		`log.info('test_rootdn_access_specific_time: PASSED')`


		`- def test_rootdn_access_day_of_week(topology_st):`
		`- '''`
		`- Test the days of week feature`
		`- '''`
		`+ def test_rootdn_access_day_of_week(topology_st, rootdn_setup):`
		`+ """Test the days of week feature`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e1`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Set the deny days`
		`+ 2. Bind as Root DN`
		`+ 3. Set the allow days`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_day_of_week...')`

		`@@ -258,10 +286,24 @@`
		`log.info('test_rootdn_access_day_of_week: PASSED')`


		`- def test_rootdn_access_denied_ip(topology_st):`
		`- '''`
		`- Test denied IP feature - we can just test denying 127.0.0.1`
		`- '''`
		`+ def test_rootdn_access_denied_ip(topology_st, rootdn_setup):`
		`+ """Test denied IP feature - we can just test denying 127.0.0.1`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e2`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Set rootdn-deny-ip to '127.0.0.1' and '::1'`
		`+ 2. Bind as Root DN`
		`+ 3. Change the denied IP so root DN succeeds`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_denied_ip...')`
		`try:`
		`@@ -333,10 +375,24 @@`
		`log.info('test_rootdn_access_denied_ip: PASSED')`


		`- def test_rootdn_access_denied_host(topology_st):`
		`- '''`
		`- Test denied Host feature - we can just test denying localhost`
		`- '''`
		`+ def test_rootdn_access_denied_host(topology_st, rootdn_setup):`
		`+ """Test denied Host feature - we can just test denying localhost`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e3`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Set rootdn-deny-host to hostname (localhost if not accessable)`
		`+ 2. Bind as Root DN`
		`+ 3. Change the denied host so root DN succeeds`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_denied_host...')`
		`hostname = socket.gethostname()`
		`@@ -410,15 +466,29 @@`
		`log.info('test_rootdn_access_denied_host: PASSED')`


		`- def test_rootdn_access_allowed_ip(topology_st):`
		`- '''`
		`- Test allowed ip feature`
		`- '''`
		`+ def test_rootdn_access_allowed_ip(topology_st, rootdn_setup):`
		`+ """Test allowed ip feature`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e4`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Set allowed ip to 255.255.255.255 - blocks the Root DN`
		`+ 2. Bind as Root DN`
		`+ 3. Allow localhost`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_allowed_ip...')`

		`#`
		`- # Set allowed host to an unknown host - blocks the Root DN`
		`+ # Set allowed ip to 255.255.255.255 - blocks the Root DN`
		`#`
		`try:`
		`conn = ldap.initialize('ldap://{}:{}'.format(LOCALHOST_IP, topology_st.standalone.port))`
		`@@ -488,10 +558,24 @@`
		`log.info('test_rootdn_access_allowed_ip: PASSED')`


		`- def test_rootdn_access_allowed_host(topology_st):`
		`- '''`
		`- Test allowed ip feature`
		`- '''`
		`+ def test_rootdn_access_allowed_host(topology_st, rootdn_setup):`
		`+ """Test allowed host feature`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e5`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Set allowed host to an unknown host - blocks the Root DN`
		`+ 2. Bind as Root DN`
		`+ 3. Allow localhost`
		`+ 4. Bind as Root DN`
		`+ 5. Cleanup - undo the changes we made so the next test has a clean slate`
		`+ :expectedresults:`
		`+ 1. Success`
		`+ 2. Should fail`
		`+ 3. Success`
		`+ 4. Success`
		`+ 5. Success`
		`+ """`

		`log.info('Running test_rootdn_access_allowed_host...')`

		`@@ -572,15 +656,52 @@`
		`log.info('test_rootdn_access_allowed_host: PASSED')`


		`- def test_rootdn_config_validate(topology_st):`
		`- '''`
		`- Test configuration validation`
		`-`
		`- test single valued attributes: rootdn-open-time,`
		`- rootdn-close-time,`
		`- rootdn-days-allowed`
		`-`
		`- '''`
		`+ def test_rootdn_config_validate(topology_st, rootdn_setup):`
		`+ """Test plugin configuration validation`
		`+`
		`+ :id: a0ef30e5-538b-46fa-9762-01a4435a15e6`
		`+ :setup: Standalone instance, rootdn plugin set up`
		`+ :steps:`
		`+ 1. Replace 'rootdn-open-time' with '0000'`
		`+ 2. Add 'rootdn-open-time': '0000' and 'rootdn-open-time': '0001'`
		`+ 3. Replace 'rootdn-open-time' with '-1' and 'rootdn-close-time' with '0000'`
		`+ 4. Replace 'rootdn-open-time' with '2400' and 'rootdn-close-time' with '0000'`
		`+ 5. Replace 'rootdn-open-time' with 'aaaaa' and 'rootdn-close-time' with '0000'`
		`+ 6. Replace 'rootdn-close-time' with '0000'`
		`+ 7. Add 'rootdn-close-time': '0000' and 'rootdn-close-time': '0001'`
		`+ 8. Replace 'rootdn-open-time' with '0000' and 'rootdn-close-time' with '-1'`
		`+ 9. Replace 'rootdn-open-time' with '0000' and 'rootdn-close-time' with '2400'`
		`+ 10. Replace 'rootdn-open-time' with '0000' and 'rootdn-close-time' with 'aaaaa'`
		`+ 11. Add 'rootdn-days-allowed': 'Mon' and 'rootdn-days-allowed': 'Tue'`
		`+ 12. Replace 'rootdn-days-allowed' with 'Mon1'`
		`+ 13. Replace 'rootdn-days-allowed' with 'Tue, Mon1'`
		`+ 14. Replace 'rootdn-days-allowed' with 'm111m'`
		`+ 15. Replace 'rootdn-days-allowed' with 'Gur'`
		`+ 16. Replace 'rootdn-allow-ip' with '12.12.Z.12'`
		`+ 17. Replace 'rootdn-deny-ip' with '12.12.Z.12'`
		`+ 18. Replace 'rootdn-allow-host' with 'host._.com'`
		`+ 19. Replace 'rootdn-deny-host' with 'host.####.com'`
		`+ :expectedresults:`
		`+ 1. Should fail`
		`+ 2. Should fail`
		`+ 3. Should fail`
		`+ 4. Should fail`
		`+ 5. Should fail`
		`+ 6. Should fail`
		`+ 7. Should fail`
		`+ 8. Should fail`
		`+ 9. Should fail`
		`+ 10. Should fail`
		`+ 11. Should fail`
		`+ 12. Should fail`
		`+ 13. Should fail`
		`+ 14. Should fail`
		`+ 15. Should fail`
		`+ 16. Should fail`
		`+ 17. Should fail`
		`+ 18. Should fail`
		`+ 19. Should fail`
		`+ """`

		`log.info('Running test_rootdn_config_validate...')`

spichugi commented 5 years ago

Description: Remove attr_uniqueness_test.py and dna_test.py
because they are present in acceptance_test.py.
Refactor the docstrings in the existing suites.

https://pagure.io/389-ds-base/issue/49381

Reviewed by: ?