summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
Diffstat (limited to 'wintest')
-rwxr-xr-xwintest/test-s4-howto.py2
-rw-r--r--wintest/wintest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 7477a47441..9d6c0617e6 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 2b33950d8a..c0f1eebebf 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)