diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2015-09-28 16:12:48 +0300 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-10-02 09:26:22 +0200 |
| commit | a0019a68551baa269a70ae021eb143633181d87b (patch) | |
| tree | 14d344077f0bf09caa1a58271102294146a0652d | |
| parent | 0a4662aa7dd52222e00e0a682b072b5b1dd0e906 (diff) | |
| download | sssd-a0019a68551baa269a70ae021eb143633181d87b.tar.gz sssd-a0019a68551baa269a70ae021eb143633181d87b.tar.xz sssd-a0019a68551baa269a70ae021eb143633181d87b.zip | |
intg: Add support for specifying all user attrs
Support passing all user attributes to ldap_ent.py's user-creation
functions, in integration tests.
| -rw-r--r-- | src/tests/intg/ldap_ent.py | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py index 30eed9d64..0bac514c3 100644 --- a/src/tests/intg/ldap_ent.py +++ b/src/tests/intg/ldap_ent.py @@ -18,7 +18,7 @@ # -def user(base_dn, uid, uidNumber, gidNumber): +def user(base_dn, uid, uidNumber, gidNumber, **kwargs): """ Generate an RFC2307(bis) user add-modlist for passing to ldap.add* """ @@ -28,13 +28,23 @@ def user(base_dn, uid, uidNumber, gidNumber): "uid=" + uid + ",ou=Users," + base_dn, [ ('objectClass', ['top', 'inetOrgPerson', 'posixAccount']), - ('cn', [uidNumber]), - ('sn', ['User']), + ('cn', [kwargs['cn'] \ + if 'cn' in kwargs else \ + uidNumber]), + ('sn', [kwargs['sn'] \ + if 'sn' in kwargs else \ + 'User']), ('uidNumber', [uidNumber]), ('gidNumber', [gidNumber]), - ('userPassword', ['Password' + uidNumber]), - ('homeDirectory', ['/home/' + uid]), - ('loginShell', ['/bin/bash']), + ('userPassword', [kwargs['userPassword'] \ + if 'userPassword' in kwargs else \ + 'Password' + uidNumber]), + ('homeDirectory', [kwargs['homeDirectory'] \ + if 'homeDirectory' in kwargs else \ + '/home/' + uid]), + ('loginShell', [kwargs['loginShell'] \ + if 'loginShell' in kwargs else \ + '/bin/bash']), ] ) @@ -86,10 +96,10 @@ class List(list): self.base_dn = base_dn def add_user(self, uid, uidNumber, gidNumber, - base_dn=None): + base_dn=None, **kwargs): """Add an RFC2307(bis) user add-modlist.""" self.append(user(base_dn or self.base_dn, - uid, uidNumber, gidNumber)) + uid, uidNumber, gidNumber, **kwargs)) def add_group(self, cn, gidNumber, member_uids=[], base_dn=None): |