Imported Debian patch 4.7.2-3

ipatests/test_xmlrpc/tracker/base.py

@@ -15,7 +15,7 @@ from ipapython.version import API_VERSION
 from ipatests.util import Fuzzy
 
 
-class BaseTracker:
+class BaseTracker(object):
     _override_me_msg = "This method needs to be overridden in a subclass"
 
     def __init__(self, default_version=None):

ipatests/test_xmlrpc/tracker/certmapdata.py

@@ -12,7 +12,7 @@ from ipapython.dn import DN
 from ipatests.util import assert_deepequal
 
 
-class CertmapdataMixin:
+class CertmapdataMixin(object):
     certmapdata_options = {u'issuer', u'subject', u'certificate',
                            u'ipacertmapdata'}
 

ipatests/test_xmlrpc/tracker/group_plugin.py

@@ -11,15 +11,11 @@ from ipatests.util import assert_deepequal, get_group_dn
 
 class GroupTracker(Tracker):
     """ Class for host plugin like tests """
-    retrieve_keys = {
-        'dn', 'cn', 'gidnumber', 'member_user', 'member_group',
-        'member_service', 'description', 'memberof_group',
-        'memberofindirect_group', 'memberindirect_group',
-        'memberindirect_user', 'memberindirect_service',
-        'membermanager_group', 'membermanager_user',
-        'member_idoverrideuser', 'memberindirect_idoverrideuser',
-        'idoverrideuser'
-    }
+    retrieve_keys = {u'dn', u'cn', u'gidnumber', u'member_user',
+                     u'member_group', u'member_service', u'description',
+                     u'memberof_group', u'memberofindirect_group',
+                     u'memberindirect_group', u'memberindirect_user',
+                     u'memberindirect_service'}
 
     retrieve_all_keys = retrieve_keys | {u'ipauniqueid', u'objectclass'}
 
@@ -73,16 +69,6 @@ class GroupTracker(Tracker):
         self.exists = True
         return self.make_command('group_detach', self.cn)
 
-    def make_add_member_manager_command(self, options={}):
-        return self.make_command(
-            'group_add_member_manager', self.cn, **options
-        )
-
-    def make_remove_member_manager_command(self, options={}):
-        return self.make_command(
-            'group_remove_member_manager', self.cn, **options
-        )
-
     def track_create(self):
         """ Updates expected state for group creation"""
         self.attrs = dict(
@@ -127,9 +113,7 @@ class GroupTracker(Tracker):
         )
 
     def add_member(self, options):
-        """ Add a member (group OR user OR service OR idoverrideuser)
-            and performs check
-        """
+        """ Add a member (group OR user OR service) and performs check """
         if u'user' in options:
             try:
                 self.attrs[u'member_user'] =\
@@ -148,14 +132,6 @@ class GroupTracker(Tracker):
                     self.attrs[u'member_service'] + [options[u'service']]
             except KeyError:
                 self.attrs[u'member_service'] = [options[u'service']]
-        elif u'idoverrideuser' in options:
-            try:
-                self.attrs[u'member_idoverrideuser'] =\
-                    self.attrs[u'member_idoverrideuser'] + \
-                    [options[u'idoverrideuser']]
-            except KeyError:
-                self.attrs[u'member_idoverrideuser'] =\
-                    [options[u'idoverrideuser']]
 
         command = self.make_add_member_command(options)
         result = command()
@@ -185,50 +161,11 @@ class GroupTracker(Tracker):
                 del self.attrs[u'member_service']
         except KeyError:
             pass
-        try:
-            if not self.attrs[u'member_idoverrideuser']:
-                del self.attrs[u'member_idoverrideuser']
-        except KeyError:
-            pass
 
         command = self.make_remove_member_command(options)
         result = command()
         self.check_remove_member(result)
 
-    def add_member_manager(self, options):
-        """Add a member manager (user or group) and perform checks"""
-        if "user" in options:
-            members = self.attrs.setdefault("membermanager_user", [])
-            members.append(options["user"])
-        elif "group" in options:
-            members = self.attrs.setdefault("membermanager_group", [])
-            members.append(options["group"])
-
-        command = self.make_add_member_manager_command(options)
-        result = command()
-        self.check_add_member_manager(result)
-
-    def remove_member_manager(self, options):
-        if "user" in options:
-            members = self.attrs["membermanager_user"]
-            members.remove(options["user"])
-            if not members:
-                self.attrs.pop("membermanager_user")
-        elif "group" in options:
-            members = self.attrs["membermanager_group"]
-            members.remove(options["group"])
-            if not members:
-                self.attrs.pop("membermanager_group")
-
-        command = self.make_remove_member_manager_command(options)
-        result = command()
-        self.check_remove_member_manager(result)
-
-    def retrieve(self, all=False, raw=False):
-        command = self.make_retrieve_command(all=all, raw=raw)
-        result = command()
-        self.check_retrieve(result, all=all, raw=raw)
-
     def check_create(self, result):
         """ Checks 'group_add' command result """
         assert_deepequal(dict(
@@ -284,8 +221,7 @@ class GroupTracker(Tracker):
         """ Checks 'group_add_member' command result """
         assert_deepequal(dict(
             completed=1,
-            failed={u'member': {u'group': (), u'user': (),
-                                u'service': (), u'idoverrideuser': ()}},
+            failed={u'member': {u'group': (), u'user': (), u'service': ()}},
             result=self.filter_attrs(self.add_member_keys)
         ), result)
 
@@ -294,8 +230,7 @@ class GroupTracker(Tracker):
         when expected result is failure of the operation"""
         expected = dict(
             completed=0,
-            failed={u'member': {u'group': (), u'user': (),
-                                u'service': (), u'idoverrideuser': ()}},
+            failed={u'member': {u'group': (), u'user': (), u'service': ()}},
             result=self.filter_attrs(self.add_member_keys)
         )
         if not options:
@@ -312,9 +247,6 @@ class GroupTracker(Tracker):
         elif u'service' in options:
             expected[u'failed'][u'member'][u'service'] = [(
                 options[u'service'], u'no such entry')]
-        elif u'idoverrideuser' in options:
-            expected[u'failed'][u'member'][u'idoverrideuser'] = [(
-                options[u'idoverrideuser'], u'no such entry')]
 
         assert_deepequal(expected, result)
 
@@ -323,8 +255,7 @@ class GroupTracker(Tracker):
         when expected result is failure of the operation"""
         expected = dict(
             completed=0,
-            failed={u'member': {u'group': (), u'user': (),
-                                u'service': (), u'idoverrideuser': ()}},
+            failed={u'member': {u'group': (), u'user': (), u'service': ()}},
             result=self.filter_attrs(self.add_member_keys)
         )
         if u'user' in options:
@@ -336,9 +267,6 @@ class GroupTracker(Tracker):
         elif u'service' in options:
             expected[u'failed'][u'member'][u'service'] = [(
                 options[u'service'], u'This entry is not a member')]
-        elif u'idoverrideuser' in options:
-            expected[u'failed'][u'member'][u'idoverrideuser'] = [(
-                options[u'service'], u'This entry is not a member')]
 
         assert_deepequal(expected, result)
 
@@ -346,16 +274,6 @@ class GroupTracker(Tracker):
         """ Checks 'group_remove_member' command result """
         self.check_add_member(result)
 
-    def check_add_member_manager(self, result):
-        assert_deepequal(dict(
-            completed=1,
-            failed={'membermanager': {'group': (), 'user': ()}},
-            result=self.filter_attrs(self.add_member_keys)
-        ), result)
-
-    def check_remove_member_manager(self, result):
-        self.check_add_member_manager(result)
-
     def check_detach(self, result):
         """ Checks 'group_detach' command result """
         assert_deepequal(dict(

ipatests/test_xmlrpc/tracker/kerberos_aliases.py

@@ -22,7 +22,7 @@ class KerberosAliasError(Exception):
     pass
 
 
-class KerberosAliasMixin:
+class KerberosAliasMixin(object):
     """KerberosAliasMixin"""
 
     def _make_add_alias_cmd(self):

ipatests/test_xmlrpc/tracker/stageuser_plugin.py

@@ -5,7 +5,6 @@
 import six
 
 from ipalib import api, errors
-from ipaplatform.constants import constants as platformconstants
 
 from ipatests.test_xmlrpc.tracker.base import Tracker
 from ipatests.test_xmlrpc.tracker.kerberos_aliases import KerberosAliasMixin
@@ -67,11 +66,11 @@ class StageUserTracker(KerberosAliasMixin, Tracker):
         """ Check for non-empty unicode string for the required attributes
         in the init method """
 
-        if not (isinstance(givenname, str) and givenname):
+        if not (isinstance(givenname, six.string_types) and givenname):
             raise ValueError(
                 "Invalid first name provided: {!r}".format(givenname)
                 )
-        if not (isinstance(sn, str) and sn):
+        if not (isinstance(sn, six.string_types) and sn):
             raise ValueError("Invalid second name provided: {!r}".format(sn))
 
         super(StageUserTracker, self).__init__(default_version=None)
@@ -144,7 +143,7 @@ class StageUserTracker(KerberosAliasMixin, Tracker):
             krbcanonicalname=[u'%s@%s' % (self.uid, self.api.env.realm)],
             mail=[u'%s@%s' % (self.uid, self.api.env.domain)],
             gecos=[u'%s %s' % (self.givenname, self.sn)],
-            loginshell=[platformconstants.DEFAULT_SHELL],
+            loginshell=[u'/bin/sh'],
             has_keytab=False,
             has_password=False,
             nsaccountlock=[u'true'],
@@ -177,13 +176,12 @@ class StageUserTracker(KerberosAliasMixin, Tracker):
 
         self.exists = True
 
-    def check_create(self, result, extra_keys=()):
+    def check_create(self, result):
         """ Check 'stageuser-add' command result """
-        expected = self.filter_attrs(self.create_keys | set(extra_keys))
         assert_deepequal(dict(
             value=self.uid,
             summary=u'Added stage user "%s"' % self.uid,
-            result=self.filter_attrs(expected),
+            result=self.filter_attrs(self.create_keys),
         ), result)
 
     def check_delete(self, result):

ipatests/test_xmlrpc/tracker/user_plugin.py

@@ -3,7 +3,6 @@
 #
 
 from ipalib import api, errors
-from ipaplatform.constants import constants as platformconstants
 from ipapython.dn import DN
 
 import six
@@ -68,11 +67,11 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
         """ Check for non-empty unicode string for the required attributes
         in the init method """
 
-        if not (isinstance(givenname, str) and givenname):
+        if not (isinstance(givenname, six.string_types) and givenname):
             raise ValueError(
                 "Invalid first name provided: {!r}".format(givenname)
                 )
-        if not (isinstance(sn, str) and sn):
+        if not (isinstance(sn, six.string_types) and sn):
             raise ValueError("Invalid second name provided: {!r}".format(sn))
 
         super(UserTracker, self).__init__(default_version=None)
@@ -182,7 +181,7 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
             krbcanonicalname=[u'%s@%s' % (self.uid, self.api.env.realm)],
             mail=[u'%s@%s' % (self.uid, self.api.env.domain)],
             gecos=[u'%s %s' % (self.givenname, self.sn)],
-            loginshell=[platformconstants.DEFAULT_SHELL],
+            loginshell=[u'/bin/sh'],
             has_keytab=False,
             has_password=False,
             mepmanagedentry=[get_group_dn(self.uid)],
@@ -227,7 +226,7 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
         result = command()
 
         for key, value in updates.items():
-            if value is None or value == '':
+            if value is None or value is '' or value is u'':
                 del self.attrs[key]
             elif key == 'rename':
                 new_principal = u'{0}@{1}'.format(value, self.api.env.realm)
@@ -241,7 +240,7 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
                 else:
                     self.attrs[key] = [value]
         for key, value in expected_updates.items():
-            if value is None or value == '':
+            if value is None or value is '' or value is u'':
                 del self.attrs[key]
             else:
                 self.attrs[key] = value
@@ -515,8 +514,7 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
         assert_deepequal(dict(
             completed=1,
             failed=dict(
-                member=dict(group=tuple(), user=tuple(),
-                            service=tuple(), idoverrideuser=tuple())
+                member=dict(group=tuple(), user=tuple(), service=tuple())
             ),
             result={
                 'dn': get_group_dn(admin_group),