wintest: Update Win2003 VM

[garming/samba-autobuild/.git] / wintest / test-s3.py

diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 1b9a26d4803c31a26064ac1730f1f6d65543466b..1e32e495095004b5710e981691364bc274bf61ed 100755 (executable)
--- 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:")
@@ -102,7 +102,7 @@ def test_smbclient(t):
 def create_shares(t):
     t.info("Adding test shares")
     t.chdir('${PREFIX}')
-    t.write_file("lib/smb.conf", '''
+    t.write_file("etc/smb.conf", '''
 [test]
        path = ${PREFIX}/test
        read only = no
@@ -122,7 +122,7 @@ def prep_join_as_member(t, vm):
     child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_time=True)
     t.get_ipconfig(child)
     t.del_files(["var", "private"])
-    t.write_file("lib/smb.conf", '''
+    t.write_file("etc/smb.conf", '''
 [global]
        netbios name = ${HOSTNAME}
        log level = ${DEBUGLEVEL}
@@ -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)