diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-05-22 12:26:55 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-05-22 14:09:31 +0200 |
| commit | 0f646d7ac5461d9d959ca71fca3c77f538a6e0ed (patch) | |
| tree | e3a1f098f7dfeb6dc49296cbedc92bce0a76ba4d | |
| parent | 50a04e5ace693dbf07cf7349d34ff8bdfb768a36 (diff) | |
| download | freeipa-0f646d7ac5461d9d959ca71fca3c77f538a6e0ed.tar.gz freeipa-0f646d7ac5461d9d959ca71fca3c77f538a6e0ed.tar.xz freeipa-0f646d7ac5461d9d959ca71fca3c77f538a6e0ed.zip | |
Handle DIR type CCACHEs in test_cmdline properly
Pass a whole krbV.CCache object to ldap2 connect() method so that
it can properly detect both type and name of a CCAHE. Otherwise
the test fails on systems with default DIR type CCACHE.
| -rw-r--r-- | tests/test_cmdline/cmdline.py | 2 | ||||
| -rw-r--r-- | tests/test_cmdline/test_ipagetkeytab.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_cmdline/cmdline.py b/tests/test_cmdline/cmdline.py index 1df6a7cce..d86652bd1 100644 --- a/tests/test_cmdline/cmdline.py +++ b/tests/test_cmdline/cmdline.py @@ -31,7 +31,7 @@ from ipaserver.plugins.ldap2 import ldap2 from ipapython import ipautil # See if our LDAP server is up and we can talk to it over GSSAPI -ccache = krbV.default_context().default_ccache().name +ccache = krbV.default_context().default_ccache() try: conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri, base_dn=api.env.basedn) diff --git a/tests/test_cmdline/test_ipagetkeytab.py b/tests/test_cmdline/test_ipagetkeytab.py index b894cea44..cb46fd23b 100644 --- a/tests/test_cmdline/test_ipagetkeytab.py +++ b/tests/test_cmdline/test_ipagetkeytab.py @@ -46,7 +46,7 @@ def use_keytab(principal, keytab): ccache.init(principal) ccache.init_creds_keytab(keytab=keytab, principal=principal) conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri, base_dn=api.env.basedn) - conn.connect(ccache=ccache.name) + conn.connect(ccache=ccache) conn.disconnect() except krbV.Krb5Error, e: raise StandardError('Unable to bind to LDAP. Error initializing principal %s in %s: %s' % (principal.name, keytab, str(e))) |