summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-17 11:21:41 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-17 05:56:04 +0100
commit0dec840677779a3d86137bb307f57b35f7392d51 (patch)
tree97a20709cce13a92d19b309add50a19c28cea188 /wintest
parent5425227b55820b3d6999870f8ffa690411611961 (diff)
downloadsamba-0dec840677779a3d86137bb307f57b35f7392d51.tar.gz
Add support for testing a Win2k3 domain member
Diffstat (limited to 'wintest')
-rw-r--r--wintest/conf/abartlet.conf15
-rwxr-xr-xwintest/test-s4-howto.py7
2 files changed, 19 insertions, 3 deletions
diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index af3c5b76d7d..aa07a7536f4 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -78,12 +78,21 @@ W2K3A_VM : Win2003R2-2
W2K3A_REALM : 2003.HOWTO.ABARTLET.NET
W2K3A_DOMAIN : 2003HOWTO
W2K3A_PASS : penguin
-W2K3A_SNAPSHOT : 1291097054
-W2K3A_IP : 192.168.122.155
+W2K3A_SNAPSHOT : 1297901741
+W2K3A_IP : 192.168.122.91
# this w2k3 VM will become a DC in the samba domain
W2K3B_HOSTNAME : Win2003R2-1
W2K3B_VM : Win2003R2-1
W2K3B_PASS : penguin
-W2K3B_SNAPSHOT : 1290386298
+W2K3B_SNAPSHOT : 1297901376
+W2K3B_IP : 192.168.122.155
+
+# this w2k3 VM will become a member in the samba domain
+W2K3C_HOSTNAME : Win2003-1
+W2K3C_VM : Win2003-1
+W2K3C_PASS : penguin
+W2K3C_SNAPSHOT : 1297900649
+W2K3C_IP : 192.168.122.38
+
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 9a848de621f..73c8a8b2768 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -592,6 +592,13 @@ def test_howto(t):
t.test_remote_smbclient("WINXP", "administrator", "${PASSWORD1}")
t.vm_poweroff("${WIN_VM}")
+ if t.have_vm('W2K3C') and not t.skip("win2k3_member"):
+ t.start_winvm("W2K3C")
+ run_winjoin(t, "W2K3C")
+ test_winjoin(t, "W2K3C")
+ t.test_remote_smbclient("W2K3C", "administrator", "${PASSWORD1}")
+ t.vm_poweroff("${WIN_VM}")
+
if t.have_vm('W2K8R2C') and not t.skip("dcpromo_rodc"):
t.info("Testing w2k8r2 RODC dcpromo")
t.start_winvm("W2K8R2C")