From dd5439e8c859f3a4420bdcf79f2199e597de028c Mon Sep 17 00:00:00 2001 From: Rowland Penny Date: Sun, 28 Aug 2016 09:29:33 +0100 Subject: [PATCH] tests/samba-tool/user.py: replace deprecated 'add' subcommand with 'create' Signed-off-by: Rowland Penny Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Aug 30 09:21:09 CEST 2016 on sn-devel-144 --- python/samba/tests/samba_tool/user.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index d2eb0e63ae57..10e4f6cd839f 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -82,7 +82,7 @@ class UserCmdTestCase(SambaToolCmdTest): # test adding users with --use-username-as-cn for user in self.users: - (result, out, err) = self.runsubcmd("user", "add", user["name"], user["password"], + (result, out, err) = self.runsubcmd("user", "create", user["name"], user["password"], "--use-username-as-cn", "--surname=%s" % user["surname"], "--given-name=%s" % user["given-name"], @@ -382,7 +382,7 @@ class UserCmdTestCase(SambaToolCmdTest): return -# samba-tool user add command didn't support users with empty gecos if none is +# samba-tool user create 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 @@ -398,7 +398,7 @@ class UserCmdTestCase(SambaToolCmdTest): "loginShell": u[6], }) # check if --rfc2307-from-nss sets the same values as we got from pwd.getpwuid() - (result, out, err) = self.runsubcmd("user", "add", user["name"], user["password"], + (result, out, err) = self.runsubcmd("user", "create", user["name"], user["password"], "--surname=%s" % user["surname"], "--given-name=%s" % user["given-name"], "--job-title=%s" % user["job-title"], @@ -423,7 +423,7 @@ class UserCmdTestCase(SambaToolCmdTest): user = self._randomPosixUser({"name": u[0]}) # create a user with posix attributes from nss but override all of them with the # random ones just obtained - (result, out, err) = self.runsubcmd("user", "add", user["name"], user["password"], + (result, out, err) = self.runsubcmd("user", "create", user["name"], user["password"], "--surname=%s" % user["surname"], "--given-name=%s" % user["given-name"], "--job-title=%s" % user["job-title"], @@ -503,7 +503,7 @@ class UserCmdTestCase(SambaToolCmdTest): self._check_user(user) def _create_user(self, user): - return self.runsubcmd("user", "add", user["name"], user["password"], + return self.runsubcmd("user", "create", user["name"], user["password"], "--surname=%s" % user["surname"], "--given-name=%s" % user["given-name"], "--job-title=%s" % user["job-title"], -- 2.34.1