wintest: cope with w2k3 form of dcdiag output

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 28505ffe4aefd74d237482f0f30490e6013015a6..840901b379015083cb58c15ad3fc9f94c429f1fe 100755 (executable)
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -692,7 +692,6 @@ def run_dcpromo_as_first_dc(t, vm, func_level=None):
     t.setwinvars(vm)
     t.info("Configuring a windows VM ${WIN_VM} at the first DC in the domain using dcpromo")
     child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_time=True)
-    child.sendline("dcdiag");
     if t.get_is_dc(child):
         return
 
@@ -704,7 +703,6 @@ def run_dcpromo_as_first_dc(t, vm, func_level=None):
         t.setvar("FUNCTION_LEVEL_INT", str(0))
 
     child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_ip=True)
-    child.sendline("dcdiag");
 
     """This server must therefore not yet be a directory server, so we must promote it"""
     child.sendline("copy /Y con answers.txt")

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 4ba4b4dc9a7ff22678a566d1b648ccb45287262d..b8e6ea2dd19d69aa69e04402f86ecf1af52c0262 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -343,11 +343,15 @@ class wintest():
         child.expect("C:")
 
     def get_is_dc(self, child):
+        '''check if a windows machine is a domain controller'''
         child.sendline("dcdiag")
-        i = child.expect(["is not a Directory Server", "is not recognized as an internal or external command", "Home Server = "])
+        i = child.expect(["is not a Directory Server",
+                          "is not recognized as an internal or external command",
+                          "Home Server = ",
+                          "passed test Replications"])
         if i == 0:
             return False
-        if i == 1:
+        if i == 1 or i == 3:
             child.expect("C:")
             child.sendline("net config Workstation")
             child.expect("Workstation domain")