From e830cb48396b6b480794c5d982f0f75f025e8c14 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 2 Feb 2011 11:48:44 +1100 Subject: [PATCH] wintest Return debug info when dcpromo fails from the log --- wintest/test-s4-howto.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index cb9862b8b92..bb000c1218d 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -166,6 +166,11 @@ SafeModeAdminPassword=${PASSWORD1} child.sendline("dcpromo /answer:answers.txt") i = child.expect(["You must restart this computer", "failed", "Active Directory Domain Services was not installed", "C:"], timeout=120) if i == 1 or i == 2: + child.sendline("echo off") + child.sendline("echo START DCPROMO log") + child.sendline("more c:\windows\debug\dcpromoui.log") + child.sendline("echo END DCPROMO log") + child.expect("END DCPROMO") raise Exception("dcpromo failed") t.wait_reboot() @@ -317,8 +322,13 @@ RebootOnCompletion=No ''') child.expect("copied.") child.sendline("dcpromo /answer:answers.txt") - i = child.expect(["You must restart this computer", "failed"], timeout=120) + i = child.expect(["You must restart this computer", "failed", "could not be located in this domain"], timeout=120) if i != 0: + child.sendline("echo off") + child.sendline("echo START DCPROMO log") + child.sendline("more c:\windows\debug\dcpromoui.log") + child.sendline("echo END DCPROMO log") + child.expect("END DCPROMO") raise Exception("dcpromo failed") child.sendline("shutdown -r -t 0") t.wait_reboot() -- 2.34.1