diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-02 11:48:44 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-02 15:21:13 +1100 |
| commit | e830cb48396b6b480794c5d982f0f75f025e8c14 (patch) | |
| tree | 544902c9fc840a397e90c692b9b42626425f693f /wintest | |
| parent | a3e99356abab3fd77a87d2ac594243b3f77e3cdd (diff) | |
| download | samba-e830cb48396b6b480794c5d982f0f75f025e8c14.tar.gz | |
wintest Return debug info when dcpromo fails from the log
Diffstat (limited to 'wintest')
| -rwxr-xr-x | wintest/test-s4-howto.py | 12 |
1 files changed, 11 insertions, 1 deletions
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() |