s4-wintest: reliability and usability improvements

- allow for missing VMs
- improved VM names
- added join of w2k3 to Samba domain
- cope with w2k3 dcpromo output
- wait for port 139 not 23, to avoid windows telnet server bug

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Nov 18 23:56:11 CET 2010 on sn-devel-104

1 files changed, 34 insertions, 29 deletions

diff --git a/source4/scripting/devel/wintest/tridge.conf b/source4/scripting/devel/wintest/tridge.conf
index 17045f66af..12885264f2 100644
--- a/source4/scripting/devel/wintest/tridge.conf
+++ b/source4/scripting/devel/wintest/tridge.conf
@@ -43,39 +43,44 @@ WINXP_SNAPSHOT        : howto-test
 WINXP_USER            : tridge
 WINXP_PASS            : penguin
 
+# Samba will join this w2k8r2 VM as a DC and then as a RODC
+W2K8R2A_HOSTNAME      : w2k8
+W2K8R2A_VM            : w2k8r2
+W2K8R2A_BASEDN        : DC=v2,DC=tridgell,DC=net
+W2K8R2A_REALM         : v2.tridgell.net
+W2K8R2A_DOMAIN        : v2
+W2K8R2A_PASS          : p@ssw0rd5
+W2K8R2A_SNAPSHOT      : howto-test
+
 # this w2k8r2 VM will become a DC in the samba domain
-WINDOWS_DC1_HOSTNAME  : w2k8r2b
-WINDOWS_DC1_VM        : w2k8r2b
-WINDOWS_DC1_PASS      : p@ssw0rd
-WINDOWS_DC1_SNAPSHOT  : howto-test2
+W2K8R2B_HOSTNAME      : w2k8r2b
+W2K8R2B_VM            : w2k8r2b
+W2K8R2B_PASS          : p@ssw0rd
+W2K8R2B_SNAPSHOT      : howto-test2
 
 # this w2k8r2 VM will become a RODC in the samba domain
-WINDOWS_DC2_HOSTNAME  : w2k8r2c
-WINDOWS_DC2_VM        : w2k8r2c
-WINDOWS_DC2_PASS      : p@ssw0rd
-WINDOWS_DC2_SNAPSHOT  : howto-test2
+W2K8R2C_HOSTNAME      : w2k8r2c
+W2K8R2C_VM            : w2k8r2c
+W2K8R2C_PASS          : p@ssw0rd
+W2K8R2C_SNAPSHOT      : howto-test2
 
-# Samba will join this VM as a DC
-WINDOWS_DC3_HOSTNAME  : w2k8
-WINDOWS_DC3_VM        : w2k8r2
-WINDOWS_DC3_BASEDN    : DC=v2,DC=tridgell,DC=net
-WINDOWS_DC3_REALM     : v2.tridgell.net
-WINDOWS_DC3_DOMAIN    : v2
-WINDOWS_DC3_PASS      : p@ssw0rd5
-WINDOWS_DC3_SNAPSHOT  : howto-test
+# Samba will join this w2k3 VM as a DC
+W2K3A_HOSTNAME        : w2k3
+W2K3A_VM              : w2003
+W2K3A_BASEDN          : DC=vsofs3,DC=com
+W2K3A_REALM           : vsofs3.com
+W2K3A_DOMAIN          : vsofs3
+W2K3A_PASS            : penguin
+W2K3A_SNAPSHOT        : howto-test
 
-# Samba will join this w2k3 box as a DC
-WINDOWS_DC4_HOSTNAME  : w2k3
-WINDOWS_DC4_VM        : w2003
-WINDOWS_DC4_BASEDN    : DC=vsofs3,DC=com
-WINDOWS_DC4_REALM     : vsofs3.com
-WINDOWS_DC4_DOMAIN    : vsofs3
-WINDOWS_DC4_PASS      : penguin
-WINDOWS_DC4_SNAPSHOT  : howto-test
+# this w2k3 VM will become a DC in the samba domain
+W2K3B_HOSTNAME        : w2k3b
+W2K3B_VM              : w2k3b
+W2K3B_PASS            : penguin
+W2K3B_SNAPSHOT        : howto-test
 
 # this w2k8 VM will become a DC in the samba domain
-WINDOWS_DC5_HOSTNAME  : w2k8c
-WINDOWS_DC5_VM        : w2k8
-WINDOWS_DC5_PASS      : p@ssw0rd
-WINDOWS_DC5_SNAPSHOT  : howto-test
-
+W2K8B_HOSTNAME        : w2k8c
+W2K8B_VM              : w2k8
+W2K8B_PASS            : p@ssw0rd
+W2K8B_SNAPSHOT        : howto-test