summaryrefslogtreecommitdiff
path: root/wintest/test-s4-howto.py
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria2@yahoo.com>2011-07-27 15:44:34 -0400
committerAndrew Tridgell <tridge@samba.org>2011-07-28 15:20:51 +1000
commit901959d9ca4ba09f03367024c3ab74cc6fb86d78 (patch)
treed166a36f4de4d196c0a8d603e412018aa4dc05b1 /wintest/test-s4-howto.py
parent31ade9c122f330cfe5a2cd4f9c27e73117f993c4 (diff)
downloadsamba-901959d9ca4ba09f03367024c3ab74cc6fb86d78.tar.gz
samba-tool: updated test suite to account for newuser change
Updated test suite invocations of newuser to "user add" as the newuser functionality is now being moved to "user add" Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'wintest/test-s4-howto.py')
-rwxr-xr-xwintest/test-s4-howto.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index abd6eebccdd..294a94e7481 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -39,8 +39,8 @@ def provision_s4(t, func_level="2008"):
if t.getvar('INTERFACE_IPV6'):
provision.append('--host-ip6=${INTERFACE_IPV6}')
t.run_cmd(provision)
- t.run_cmd('bin/samba-tool newuser testallowed ${PASSWORD1}')
- t.run_cmd('bin/samba-tool newuser testdenied ${PASSWORD1}')
+ t.run_cmd('bin/samba-tool user add testallowed ${PASSWORD1}')
+ t.run_cmd('bin/samba-tool user add testdenied ${PASSWORD1}')
t.run_cmd('bin/samba-tool group addmembers "Allowed RODC Password Replication Group" testallowed')
@@ -259,7 +259,7 @@ def test_dcpromo(t, vm):
child.expect("was successful")
t.info("Checking if new users propogate to windows")
- t.retry_cmd('bin/samba-tool newuser test2 ${PASSWORD2}', ["created successfully"])
+ t.retry_cmd('bin/samba-tool user add test2 ${PASSWORD2}', ["created successfully"])
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${LCREALM} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${LCREALM} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
@@ -373,7 +373,7 @@ def test_dcpromo_rodc(t, vm):
regex=True)
t.info("Checking if new users are available on windows")
- t.run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
+ t.run_cmd('bin/samba-tool user add test2 ${PASSWORD2}')
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${LCREALM} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
t.retry_cmd("bin/samba-tool drs replicate ${WIN_HOSTNAME}.${LCREALM} ${HOSTNAME}.${LCREALM} ${BASEDN}", ["was successful"])
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${LCREALM} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
@@ -445,7 +445,7 @@ def test_join_as_dc(t, vm):
child.expect("was successful")
t.info("Checking if new users propogate to windows")
- t.retry_cmd('bin/samba-tool newuser test2 ${PASSWORD2}', ["created successfully"])
+ t.retry_cmd('bin/samba-tool user add test2 ${PASSWORD2}', ["created successfully"])
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${WIN_REALM} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${WIN_REALM} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
@@ -528,7 +528,7 @@ def test_join_as_rodc(t, vm):
# should this work?
t.info("Checking if new users propogate to windows")
- t.cmd_contains('bin/samba-tool newuser test2 ${PASSWORD2}', ['No RID Set DN'])
+ t.cmd_contains('bin/samba-tool user add test2 ${PASSWORD2}', ['No RID Set DN'])
t.info("Checking propogation of user deletion")
child.sendline("net user test3 /del")