diff options
author | Tomas Krizek <tkrizek@redhat.com> | 2016-10-05 17:42:32 +0200 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-11-07 11:34:03 +0100 |
commit | de58a5c60596de8b45c8016c3318bac78305477a (patch) | |
tree | 80ea270b7dd694ab2ecd6404526e156858758260 /ipatests | |
parent | 5760b7e983da6bda8f5383d9079551e4acb4c2da (diff) | |
download | freeipa-de58a5c60596de8b45c8016c3318bac78305477a.tar.gz freeipa-de58a5c60596de8b45c8016c3318bac78305477a.tar.xz freeipa-de58a5c60596de8b45c8016c3318bac78305477a.zip |
ipaldap: merge simple_bind into LDAPClient
* Use LDAPClient.simple_bind instead of extra call to IPAdmin.do_simple_bind
* Rename binddn to bind_dn
* Rename bindpw to bind_password
* Explicitly specify bind_dn in all calls
https://fedorahosted.org/freeipa/ticket/6461
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r-- | ipatests/test_install/test_updates.py | 3 | ||||
-rw-r--r-- | ipatests/test_integration/host.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ipatests/test_install/test_updates.py b/ipatests/test_install/test_updates.py index 4053d3547..553788d2a 100644 --- a/ipatests/test_install/test_updates.py +++ b/ipatests/test_install/test_updates.py @@ -64,7 +64,8 @@ class test_update(unittest.TestCase): raise nose.SkipTest("No directory manager password") self.updater = LDAPUpdate(dm_password=self.dm_password, sub_dict={}) self.ld = ipaldap.IPAdmin(fqdn) - self.ld.do_simple_bind(bindpw=self.dm_password) + self.ld.simple_bind(bind_dn=ipaldap.DIRMAN_DN, + bind_password=self.dm_password) self.testdir = os.path.abspath(os.path.dirname(__file__)) if not ipautil.file_exists(os.path.join(self.testdir, "0_reset.update")): diff --git a/ipatests/test_integration/host.py b/ipatests/test_integration/host.py index 399884fdb..8b9ebd5e8 100644 --- a/ipatests/test_integration/host.py +++ b/ipatests/test_integration/host.py @@ -47,7 +47,7 @@ class Host(pytest_multihost.host.Host): ldap = IPAdmin(self.external_hostname) binddn = self.config.dirman_dn self.log.info('LDAP bind as %s' % binddn) - ldap.do_simple_bind(binddn, self.config.dirman_password) + ldap.simple_bind(binddn, self.config.dirman_password) return ldap @classmethod |