diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-10-02 18:45:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-10-03 14:25:57 +0200 |
| commit | 10eba77dcbeec4b389aeb0a456884b7f067c1a3e (patch) | |
| tree | 4fff4c6a2e6bca734c76b950c53c7572d082d697 /wintest | |
| parent | 535fe95f3c884b247d374685cc4408aeabc64437 (diff) | |
| download | samba-10eba77dcbeec4b389aeb0a456884b7f067c1a3e.tar.gz samba-10eba77dcbeec4b389aeb0a456884b7f067c1a3e.tar.bz2 samba-10eba77dcbeec4b389aeb0a456884b7f067c1a3e.zip | |
wintest: Give netdom join more time to complete
Diffstat (limited to 'wintest')
| -rwxr-xr-x | wintest/test-s4-howto.py | 2 | ||||
| -rw-r--r-- | wintest/wintest.py | 2 |
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) |