Set the e-mail attribute using the default domain name by default
https://fedorahosted.org/freeipa/ticket/2810
This commit is contained in:
1 parent
26dfbe61dd
commit
e4e5bd0595
10 files changed
+58
-7
No files matched your search
@@ -2,7 +2,6 @@
|
||||
# Rob Crittenden <rcritten@redhat.com>
|
||||
# Pavel Zuna <pzuna@redhat.com>
|
||||
# Jason Gerard DeRose <jderose@redhat.com>
|
||||
# John Dennis <jdennis@redhat.com>
|
||||
#
|
||||
# Copyright (C) 2008, 2009 Red Hat
|
||||
# see file 'COPYING' for use and warranty information
|
||||
@@ -117,6 +116,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -157,6 +157,7 @@ class test_user(Declarative):
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
@@ -199,6 +200,7 @@ class test_user(Declarative):
|
||||
'displayname': [u'Test User1'],
|
||||
'cn': [u'Test User1'],
|
||||
'initials': [u'TU'],
|
||||
'mail': [u'%s@%s' % (user1, api.env.domain)],
|
||||
},
|
||||
],
|
||||
summary=u'1 user matched',
|
||||
@@ -244,6 +246,7 @@ class test_user(Declarative):
|
||||
has_password=False,
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
),
|
||||
],
|
||||
summary=u'1 user matched',
|
||||
@@ -284,6 +287,7 @@ class test_user(Declarative):
|
||||
has_password=False,
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
),
|
||||
],
|
||||
summary=u'2 users matched',
|
||||
@@ -427,6 +431,7 @@ class test_user(Declarative):
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
@@ -461,6 +466,7 @@ class test_user(Declarative):
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
@@ -485,6 +491,7 @@ class test_user(Declarative):
|
||||
uid=[renameduser1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
@@ -515,6 +522,7 @@ class test_user(Declarative):
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
@@ -575,6 +583,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -611,6 +620,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -647,6 +657,7 @@ class test_user(Declarative):
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
nsaccountlock=False,
|
||||
has_keytab=False,
|
||||
has_password=False,
|
||||
@@ -676,6 +687,7 @@ class test_user(Declarative):
|
||||
has_password=False,
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
manager=[user1],
|
||||
),
|
||||
],
|
||||
@@ -825,6 +837,7 @@ class test_user(Declarative):
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
street=[u'123 Maple Rd'],
|
||||
l=[u'Anytown'],
|
||||
st=[u'MD'],
|
||||
@@ -874,6 +887,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -922,6 +936,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -950,6 +965,7 @@ class test_user(Declarative):
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
nsaccountlock=False,
|
||||
has_keytab=True,
|
||||
has_password=True,
|
||||
@@ -992,6 +1008,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -1064,6 +1081,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -1126,6 +1144,7 @@ class test_user(Declarative):
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
('cn','kerberos'),api.env.basedn)],
|
||||
@@ -1186,6 +1205,7 @@ class test_user(Declarative):
|
||||
gidnumber=[u'1000'],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -1238,6 +1258,7 @@ class test_user(Declarative):
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
mail=[u'%s@%s' % (user1, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -1273,6 +1294,7 @@ class test_user(Declarative):
|
||||
gidnumber=[u'1000'],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
mail=[u'%s@%s' % (user2, api.env.domain)],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
@@ -1330,6 +1352,7 @@ class test_user(Declarative):
|
||||
displayname=[u'Second Admin'],
|
||||
cn=[u'Second Admin'],
|
||||
initials=[u'SA'],
|
||||
mail=[u'%s@%s' % (admin2, api.env.domain)],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
|
||||
('cn','kerberos'),api.env.basedn)],
|
||||
|
||||
Reference in new issue
Block a user