diff options
| -rw-r--r-- | wintest/wintest.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py index c9bd87554e..5f7bd0a8d5 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -341,12 +341,25 @@ class wintest(): def get_is_dc(self, child): child.sendline("dcdiag") - i = child.expect(["is not a Directory Server", "Home Server = "]) + i = child.expect(["is not a Directory Server", "is not recognized as an internal or external command", "Home Server = "]) if i == 0: return False + if i == 1: + child.expect("C:") + child.sendline("net config Workstation") + child.expect("Workstation domain") + child.expect('[\S]+') + domain = child.after + i = child.expect(["Workstation Domain DNS Name", "Logon domain"]) + '''If we get the Logon domain first, we are not in an AD domain''' + if i == 1: + return False + if domain.upper() == self.getvar("WIN_DOMAIN").upper(): + return True + child.expect('[\S]+') hostname = child.after - if hostname.upper() == self.getvar("WIN_HOSTNAME").upper: + if hostname.upper() == self.getvar("WIN_HOSTNAME").upper(): return True def run_tlntadmn(self, child): |