Hi,
sending the refactored automember plugin test for review.
Filip
From 8c3abf76cfb899afb65f1a453df6a5b4815ad473 Mon Sep 17 00:00:00 2001
From: Filip Skola
Date: Mon, 11 Apr 2016 16:59:00 +0200
Subject: [PATCH] Refactor test_automember_plugin, create AutomemberTracker
---
ipatests/test_xmlrpc/test_automember_plugin.py| 2163 ++---
ipatests/test_xmlrpc/tracker/automember_plugin.py | 338
2 files changed, 945 insertions(+), 1556 deletions(-)
create mode 100644 ipatests/test_xmlrpc/tracker/automember_plugin.py
diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py
index be0f7390565ed739aa66bc0c5c6d23d25d67df92..2078b1fcbbea112f101348c6ae039fa2ff3a6d28 100644
--- a/ipatests/test_xmlrpc/test_automember_plugin.py
+++ b/ipatests/test_xmlrpc/test_automember_plugin.py
@@ -21,43 +21,20 @@
Test the `ipalib/plugins/automember.py` module.
"""
+from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker
+from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker
+from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker
+from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker
+from ipatests.test_xmlrpc.tracker.automember_plugin import AutomemberTracker
from ipalib import api, errors
from ipapython.dn import DN
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (
-Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_automember_dn,
-fuzzy_automember_message)
-from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, raises_exact
+from ipatests.util import assert_deepequal
import pytest
-user1 = u'tuser1'
user_does_not_exist = u'does_not_exist'
-manager1 = u'mscott'
-fqdn1 = u'web1.%s' % api.env.domain
-short1 = u'web1'
-fqdn2 = u'dev1.%s' % api.env.domain
-short2 = u'dev1'
-fqdn3 = u'web5.%s' % api.env.domain
-short3 = u'web5'
-fqdn4 = u'www5.%s' % api.env.domain
-short4 = u'www5'
-fqdn5 = u'webserver5.%s' % api.env.domain
-short5 = u'webserver5'
fqdn_does_not_exist = u'does_not_exist.%s' % api.env.domain
-
-group1 = u'group1'
-group1_dn = DN(('cn', group1), ('cn', 'groups'),
- ('cn', 'accounts'), api.env.basedn)
-defaultgroup1 = u'defaultgroup1'
-hostgroup1 = u'hostgroup1'
-hostgroup1_dn = DN(('cn', hostgroup1), ('cn', 'hostgroups'),
- ('cn', 'accounts'), api.env.basedn)
-hostgroup2 = u'hostgroup2'
-hostgroup3 = u'hostgroup3'
-hostgroup4 = u'hostgroup4'
-defaulthostgroup1 = u'defaulthostgroup1'
-
group_include_regex = u'mscott'
hostgroup_include_regex = u'^web[1-9]'
hostgroup_include_regex2 = u'^www[1-9]'
@@ -67,1600 +44,674 @@ hostgroup_exclude_regex2 = u'^www5'
hostgroup_exclude_regex3 = u'^webserver5'
-@pytest.mark.tier1
-class test_automember(Declarative):
-
-cleanup_commands = [
-('user_del', [user1, manager1], {}),
-('group_del', [group1, defaultgroup1], {}),
-('host_del', [fqdn1, fqdn2, fqdn3, fqdn4, fqdn5], {}),
-('hostgroup_del', [hostgroup1, hostgroup2, hostgroup3, hostgroup4, defaulthostgroup1], {}),
-('automember_del', [group1], {'type': u'group'}),
-('automember_del', [hostgroup1], {'type': u'hostgroup'}),
-('automember_del', [hostgroup2], {'type': u'hostgroup'}),
-('automember_del', [hostgroup3], {'type': u'hostgroup'}),
-('automember_del', [hostgroup4], {'type': u'hostgroup'}),
-('automember_default_group_remove', [], {'type': u'hostgroup'}),
-('automember_default_group_remove', [], {'type': u'group'}),
-
-]
-
-tests = [
-
-dict(
-desc='Try to retrieve non-existent group rule %r' % group1,
-command=('automember_add', [group1],
-dict(description=u'Test desc', type=u'group')),
-expected=errors.NotFound(reason=u'group "%s" not found' % group1),
-),
-
-dict(
-desc='Try to update non-existent group rule %r' % group1,
-command=('automember_add', [group1], dict(type=u'group')),
-expected=errors.NotFound(reason=u'group "%s" not found' % group1),
-),
-
-dict(
-desc='Try to delete non-existent group rule %r' % group1,
-command=('automember_del', [group1], dict(type=u'group')),
-expected=errors.NotFound(reason=u': Automember rule not found'),
-),
-
-
-dict(
-desc='Try to retrieve non-existent hostgroup rule %r' % hostgroup1,
-command=('automember_add', [hostgroup1],
-dict(description=u'Test desc', type=u'hostgroup')),
-expected=errors.NotFound(
-reason=u'hostgroup "%s" not found' % hostgroup1),
-),
-
-dict(
-desc='Try to update non-existent hostgroup rule %r' % hostgroup1,
-command=('automember_add', [hostgroup1], dict(type=u'hostgroup')),
-
