sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

wintest: cope with w2k3 form of dcdiag output

Browse Source
This commit is contained in:
Andrew Tridgell 2010-12-01 16:34:16 +11:00
parent 06fd5b7003
commit 00ecbdbbd1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wintest/test-s4-howto.py
View File

@ -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")

8
wintest/wintest.py
View File

@ -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")