wintest Improve wintest's handling of IP addresses and add more auto-setup

 - Don't change the IP address if DHCP is not in use

   The main reason to 'fix' the IP is to get around Dynamic DNS issues caused
   by the DHCP server, if the VM is already on a fixed IP, it does not matter.

 - Set the maximum telnet connection limit to 1024

   This ensures that we can always make a new connection, regardless
   of the existing configuration.  We also catch more conditions when
   the server has restricted the number of connections, and try again.

 - Set the route after the connection drops out

   My WinXP box always wants to drop the default route

 - Set the DNS as a distinct step

   My WinXP box drops the connection when we set DNS servers

Andrew Bartlett

1 files changed, 0 insertions, 1 deletions

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 65fb5ae9c1..2f7ee1a859 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -127,7 +127,6 @@ def run_winjoin(t, vm):
     t.port_wait("${WIN_HOSTNAME}", 139, wait_for_fail=True)
     t.port_wait("${WIN_HOSTNAME}", 139)
     child = t.open_telnet("${WIN_HOSTNAME}", "${WIN_USER}", "${WIN_PASS}", set_time=True, set_ip=True)
-    child.expect("C:")
     child.sendline("ipconfig /registerdns")
     child.expect("Registration of the DNS resource records for all adapters of this computer has been initiated. Any errors will be reported in the Event Viewer")
     child.expect("C:")