diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_xmlrpc/test_automember_plugin.py | 12 | ||||
| -rw-r--r-- | tests/test_xmlrpc/test_hostgroup_plugin.py | 7 | ||||
| -rw-r--r-- | tests/test_xmlrpc/test_nesting.py | 5 | ||||
| -rw-r--r-- | tests/test_xmlrpc/test_netgroup_plugin.py | 1 |
4 files changed, 1 insertions, 24 deletions
diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/tests/test_xmlrpc/test_automember_plugin.py index 342bc21eb..1241bd669 100644 --- a/tests/test_xmlrpc/test_automember_plugin.py +++ b/tests/test_xmlrpc/test_automember_plugin.py @@ -136,7 +136,6 @@ class test_automember(Declarative): description=[u'Test desc'], objectclass=objectclasses.hostgroup, ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[u'hostgroup1'], mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup1, api.env.basedn)], dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup1, api.env.basedn), ), @@ -157,7 +156,6 @@ class test_automember(Declarative): description=[u'Test desc'], objectclass=objectclasses.hostgroup, ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[u'hostgroup2'], mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup2, api.env.basedn)], dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup2, api.env.basedn), ), @@ -178,7 +176,6 @@ class test_automember(Declarative): description=[u'Test desc'], objectclass=objectclasses.hostgroup, ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[u'hostgroup3'], mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup3, api.env.basedn)], dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup3, api.env.basedn), ), @@ -199,7 +196,6 @@ class test_automember(Declarative): description=[u'Test desc'], objectclass=objectclasses.hostgroup, ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[u'hostgroup4'], mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup4, api.env.basedn)], dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup4, api.env.basedn), ), @@ -240,7 +236,6 @@ class test_automember(Declarative): description=[u'Default test desc'], objectclass=objectclasses.hostgroup, ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[u'defaulthostgroup1'], mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (defaulthostgroup1, api.env.basedn)], dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (defaulthostgroup1, api.env.basedn), ), @@ -998,7 +993,6 @@ class test_automember(Declarative): 'member_host': [u'%s' % fqdn1], 'cn': [hostgroup1], 'description': [u'Test desc'], - 'memberof_netgroup': [u'hostgroup1'], }, ), ), @@ -1015,7 +1009,6 @@ class test_automember(Declarative): 'member_host': [u'%s' % fqdn2], 'cn': [defaulthostgroup1], 'description': [u'Default test desc'], - 'memberof_netgroup': [u'defaulthostgroup1'], }, ), ), @@ -1032,7 +1025,6 @@ class test_automember(Declarative): 'member_host': [u'%s' % fqdn3], 'cn': [hostgroup2], 'description': [u'Test desc'], - 'memberof_netgroup': [u'hostgroup2'], }, ), ), @@ -1049,7 +1041,6 @@ class test_automember(Declarative): 'member_host': [u'%s' % fqdn4], 'cn': [hostgroup3], 'description': [u'Test desc'], - 'memberof_netgroup': [u'hostgroup3'], }, ), ), @@ -1066,9 +1057,8 @@ class test_automember(Declarative): 'member_host': [u'%s' % fqdn5], 'cn': [hostgroup4], 'description': [u'Test desc'], - 'memberof_netgroup': [u'hostgroup4'], }, ), ), - ]
\ No newline at end of file + ] diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py index 6c3b0a41e..e0d115854 100644 --- a/tests/test_xmlrpc/test_hostgroup_plugin.py +++ b/tests/test_xmlrpc/test_hostgroup_plugin.py @@ -83,7 +83,6 @@ class test_hostgroup(Declarative): objectclass=objectclasses.hostgroup, description=[u'Test hostgroup 1'], ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[hostgroup1], mepmanagedentry=lambda x: [DN(i) for i in x] == \ [DN(('cn',hostgroup1),('cn','ng'),('cn','alt'), api.env.basedn)], @@ -147,7 +146,6 @@ class test_hostgroup(Declarative): 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], 'member_host': [fqdn1], - 'memberof_netgroup': [hostgroup1], }, ), ), @@ -164,7 +162,6 @@ class test_hostgroup(Declarative): 'member_host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], - 'memberof_netgroup': [hostgroup1], }, ), ), @@ -183,7 +180,6 @@ class test_hostgroup(Declarative): 'member_host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], - 'memberof_netgroup': [hostgroup1], }, ], ), @@ -202,7 +198,6 @@ class test_hostgroup(Declarative): cn=[hostgroup1], description=[u'Updated hostgroup 1'], member_host=[u'testhost1.%s' % api.env.domain], - memberof_netgroup=[hostgroup1], ), ), ), @@ -219,7 +214,6 @@ class test_hostgroup(Declarative): 'member_host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Updated hostgroup 1'], - 'memberof_netgroup': [hostgroup1], }, ), ), @@ -242,7 +236,6 @@ class test_hostgroup(Declarative): 'dn': lambda x: DN(x) == dn1, 'cn': [hostgroup1], 'description': [u'Updated hostgroup 1'], - 'memberof_netgroup': [hostgroup1], }, ), ), diff --git a/tests/test_xmlrpc/test_nesting.py b/tests/test_xmlrpc/test_nesting.py index 31525cd26..cb2d1d0b2 100644 --- a/tests/test_xmlrpc/test_nesting.py +++ b/tests/test_xmlrpc/test_nesting.py @@ -705,7 +705,6 @@ class test_nesting(Declarative): objectclass=objectclasses.hostgroup, description=[u'Test hostgroup 1'], ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[hostgroup1], mepmanagedentry=lambda x: [DN(i) for i in x] == \ [DN(('cn',hostgroup1),('cn','ng'),('cn','alt'), api.env.basedn)], @@ -728,7 +727,6 @@ class test_nesting(Declarative): objectclass=objectclasses.hostgroup, description=[u'Test hostgroup 2'], ipauniqueid=[fuzzy_uuid], - memberof_netgroup=[hostgroup2], mepmanagedentry=lambda x: [DN(i) for i in x] == \ [DN(('cn',hostgroup2),('cn','ng'),('cn','alt'), api.env.basedn)], @@ -755,7 +753,6 @@ class test_nesting(Declarative): 'cn': [hostgroup2], 'description': [u'Test hostgroup 2'], 'member_host': [fqdn1], - 'memberof_netgroup': [hostgroup2], }, ), ), @@ -779,7 +776,6 @@ class test_nesting(Declarative): 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], 'member_hostgroup': [hostgroup2], - 'memberof_netgroup': [hostgroup1], }, ), ), @@ -795,7 +791,6 @@ class test_nesting(Declarative): 'dn': lambda x: DN(x) == hgdn1, 'memberindirect_host': [u'testhost1.%s' % api.env.domain], 'member_hostgroup': [hostgroup2], - 'memberof_netgroup': [hostgroup1], 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], }, diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py index f28c667ac..9194b5492 100644 --- a/tests/test_xmlrpc/test_netgroup_plugin.py +++ b/tests/test_xmlrpc/test_netgroup_plugin.py @@ -188,7 +188,6 @@ class test_netgroup(Declarative): cn=[hostgroup1], objectclass=objectclasses.hostgroup, description=[u'Test hostgroup 1'], - memberof_netgroup=[hostgroup1], mepmanagedentry=lambda x: [DN(i) for i in x] == \ [DN(('cn',hostgroup1),('cn','ng'),('cn','alt'), api.env.basedn)], |