summaryrefslogtreecommitdiff
path: root/wintest/wintest.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-01 16:34:16 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-01 17:00:47 +1100
commit00ecbdbbd13ba191400c6f4185df2dd8e72d1459 (patch)
tree6728ed03fce3c317fe58d2986b1e8644c9e0780c /wintest/wintest.py
parent06fd5b70037728800cfeb2d1989ad8e851f604df (diff)
downloadsamba-00ecbdbbd13ba191400c6f4185df2dd8e72d1459.tar.gz
samba-00ecbdbbd13ba191400c6f4185df2dd8e72d1459.tar.bz2
samba-00ecbdbbd13ba191400c6f4185df2dd8e72d1459.zip
wintest: cope with w2k3 form of dcdiag output
Diffstat (limited to 'wintest/wintest.py')
-rw-r--r--wintest/wintest.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 4ba4b4dc9a..b8e6ea2dd1 100644
--- 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")