summaryrefslogtreecommitdiffstats
path: root/wintest/wintest.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-29 17:19:55 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-29 08:49:36 +0100
commit702508745682c29cb3f9959b7c22d535b767459f (patch)
tree4e455495e3b0a194a10e8c1680383e5b0f325663 /wintest/wintest.py
parentdc0c89cf405e7cc1d66540c4f94b1b395da2439a (diff)
downloadsamba-702508745682c29cb3f9959b7c22d535b767459f.tar.gz
samba-702508745682c29cb3f9959b7c22d535b767459f.tar.xz
samba-702508745682c29cb3f9959b7c22d535b767459f.zip
wintest: cope with the heimdal version of kinit
Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Mon Nov 29 08:49:36 CET 2010 on sn-devel-104
Diffstat (limited to 'wintest/wintest.py')
-rw-r--r--wintest/wintest.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py
index effc77e95ef..67af51a313b 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -453,11 +453,13 @@ class wintest():
if len(s) > 0:
s[1] = s[1].upper()
username = '@'.join(s)
- child = self.pexpect_spawn('kinit -V ' + username)
- child.expect("Password for")
+ child = self.pexpect_spawn('kinit ' + username)
+ child.expect("Password")
child.sendline(password)
- child.expect("Authenticated to Kerberos")
-
+ child.expect(pexpect.EOF)
+ child.close()
+ if child.exitstatus != 0:
+ raise RuntimeError("kinit failed with status %d" % child.exitstatus)
def get_domains(self):
'''return a dictionary of DNS domains and IPs for named.conf'''