wintest: Give netdom join more time to complete

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 7477a4744115cc6f046e9c8e83d6248379cfdfa9..9d6c0617e6006a67176fc0bb4856213e33c6fe04 100755 (executable)
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -57,7 +57,7 @@ def start_s4(t):
     t.chdir("${PREFIX}")
     t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
     t.run_cmd(['sbin/samba',
-             '--option', 'panic action=gnome-terminal -e "gdb --pid %d"'])
+             '--option', 'panic action=gnome-terminal -e "gdb --pid %d"', '--option', 'max protocol=nt1'])
     t.port_wait("${INTERFACE_IP}", 139)
 
 def test_smbclient(t):

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 2b33950d8ab0399375fbfcd9be6041bc5c1fe15a..c0f1eebebfe789075d5cc86891b7850569176bba 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -878,7 +878,7 @@ RebootOnCompletion=No
             child.expect("C:")
             child.sendline("netdom join ${WIN_HOSTNAME} /Domain:%s /UserD:%s /PasswordD:%s" % (domain, username, password))
             i = child.expect(["The command completed successfully", 
-                             "The specified domain either does not exist or could not be contacted."])
+                             "The specified domain either does not exist or could not be contacted."], timeout=120)
             if i == 0:
                 break
             time.sleep(10)