sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

wintest: cope with the heimdal version of kinit

Browse Source 
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Nov 29 08:49:36 CET 2010 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2010-11-29 17:19:55 +11:00
parent dc0c89cf40
commit 7025087456
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wintest/test-s4-howto.py
View File

@ -239,7 +239,8 @@ def test_kerberos(t):
t.info("Testing kerberos")
t.run_cmd("kdestroy")
t.kinit("administrator@${REALM}", "${PASSWORD1}")
t.cmd_contains("klist -e", ["Ticket cache", "Default principal", "Valid starting"])
# this copes with the differences between MIT and Heimdal klist
t.cmd_contains("klist", ["rincipal", "administrator@${REALM}"])
def test_dyndns(t):

10
wintest/wintest.py
View File

@ -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'''