From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 2 Oct 2012 08:45:39 +0000 (+1000)
Subject: wintest: Give netdom join more time to complete
X-Git-Tag: ldb-1.1.14~393
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=10eba77dcbeec4b389aeb0a456884b7f067c1a3e

wintest: Give netdom join more time to complete
---

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 7477a474411..9d6c0617e60 100755
--- 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 2b33950d8ab..c0f1eebebfe 100644
--- 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)