summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-15 10:08:07 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-16 15:20:09 +1100
commitde2bb2a7f85cc75c37372cda38eb6b9741b77a15 (patch)
treef90b09c77ac309a50f6cd9d055788cec567258e2
parent98e438df00111541958b54543b3056c06783fd73 (diff)
downloadsamba-de2bb2a7f85cc75c37372cda38eb6b9741b77a15.tar.gz
samba-de2bb2a7f85cc75c37372cda38eb6b9741b77a15.tar.bz2
samba-de2bb2a7f85cc75c37372cda38eb6b9741b77a15.zip
wintest: Samba is now all version 4.0
-rwxr-xr-xwintest/test-s3.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 8ea1ade690..1e32e49509 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -43,7 +43,7 @@ def start_s3(t):
def test_wbinfo(t):
t.info('Testing wbinfo')
t.chdir('${PREFIX}')
- t.cmd_contains("bin/wbinfo --version", ["Version 3."])
+ t.cmd_contains("bin/wbinfo --version", ["Version 4."])
t.cmd_contains("bin/wbinfo -p", ["Ping to winbindd succeeded"])
t.retry_cmd("bin/wbinfo --online-status",
["BUILTIN : online",
@@ -74,8 +74,8 @@ def test_wbinfo(t):
def test_smbclient(t):
t.info('Testing smbclient')
t.chdir('${PREFIX}')
- t.cmd_contains("bin/smbclient --version", ["Version 3."])
- t.cmd_contains('bin/smbclient -L ${INTERFACE_IP} -U%', ["Domain=[${WIN_DOMAIN}]", "test", "IPC$", "Samba 3."],
+ t.cmd_contains("bin/smbclient --version", ["Version 4."])
+ t.cmd_contains('bin/smbclient -L ${INTERFACE_IP} -U%', ["Domain=[${WIN_DOMAIN}]", "test", "IPC$", "Samba 4."],
casefold=True)
child = t.pexpect_spawn('bin/smbclient //${HOSTNAME}.${WIN_REALM}/test -Uroot@${WIN_REALM}%${PASSWORD2}')
child.expect("smb:")
@@ -182,7 +182,7 @@ def test_join_as_member(t, vm):
def test_s3(t):
'''basic s3 testing'''
- t.setvar("SAMBA_VERSION", "Version 3")
+ t.setvar("SAMBA_VERSION", "Version 4")
t.check_prerequesites()
set_libpath(t)