sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

samba-tool/tests: Force the gecos of the user to a fixed value.

Browse Source 
When --gecos is not specified samba-tool user add will try to read the
gecos field from a getpw call. And if user's GECOS is empty (like the
build user on sn-devel-104) then the test will fail because we can't add
an empty gecos.

Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed May 15 16:19:23 CEST 2013 on sn-devel-104
This commit is contained in:
Matthieu Patou 2013-05-14 06:20:18 -07:00 committed by Stefan Metzmacher
parent 54f4536980
commit fbb12b574d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/samba/tests/samba_tool/user.py
View File

@ -212,12 +212,20 @@ class UserCmdTestCase(SambaToolCmdTest):
self.skipTest("Skipping getpwent test, current EUID not found in NSS") self.skipTest("Skipping getpwent test, current EUID not found in NSS")
return return
# samba-tool user add command didn't support users with empty gecos if none is
# specified on the command line and the user hasn't one in the passwd file it
# will fail, so let's add some contents
gecos = u[4]
if (gecos is None or len(gecos) == 0):
gecos = "Foo GECOS"
user = self._randomPosixUser({ user = self._randomPosixUser({
"name": u[0], "name": u[0],
"uid": u[0], "uid": u[0],
"uidNumber": u[2], "uidNumber": u[2],
"gidNumber": u[3], "gidNumber": u[3],
"gecos": u[4], "gecos": gecos,
"loginShell": u[6], "loginShell": u[6],
}) })
# check if --rfc2307-from-nss sets the same values as we got from pwd.getpwuid() # check if --rfc2307-from-nss sets the same values as we got from pwd.getpwuid()
@ -228,6 +236,7 @@ class UserCmdTestCase(SambaToolCmdTest):
"--department=%s" % user["department"], "--department=%s" % user["department"],
"--description=%s" % user["description"], "--description=%s" % user["description"],
"--company=%s" % user["company"], "--company=%s" % user["company"],
"--gecos=%s" % user["gecos"],
"--rfc2307-from-nss", "--rfc2307-from-nss",
"-H", "ldap://%s" % os.environ["DC_SERVER"], "-H", "ldap://%s" % os.environ["DC_SERVER"],
"-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))