From 53abf0105b3dd6d5e2b258375c03e6ecc23bc162 Mon Sep 17 00:00:00 2001 From: David Kupka Date: Thu, 19 Jan 2017 09:18:32 +0100 Subject: [PATCH] tests: Add LDAP URI to ldappasswd explicitly Tests should always rely on api.env.* values when possible. Without this running the tests remotely can result in errors such as ldap{search,modify,passwd} attempting to connect to the wrong URI and failing. https://fedorahosted.org/freeipa/ticket/6622 Reviewed-By: Alexander Bokovoy Reviewed-By: Rob Crittenden --- ipatests/pytest_plugins/integration/tasks.py | 3 ++- ipatests/util.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py index 2229b2918..4bb7dd466 100644 --- a/ipatests/pytest_plugins/integration/tasks.py +++ b/ipatests/pytest_plugins/integration/tasks.py @@ -1326,9 +1326,10 @@ def ldappasswd_user_change(user, oldpw, newpw, master): basedn = master.domain.basedn userdn = "uid={},{},{}".format(user, container_user, basedn) + master_ldap_uri = "ldap://{}".format(master.external_hostname) args = [paths.LDAPPASSWD, '-D', userdn, '-w', oldpw, '-a', oldpw, - '-s', newpw, '-x'] + '-s', newpw, '-x', '-H', master_ldap_uri] master.run_command(args) diff --git a/ipatests/util.py b/ipatests/util.py index 74c5dbc4c..bc33a1497 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -750,7 +750,7 @@ def unlock_principal_password(user, oldpw, newpw): user, api.env.container_user, api.env.basedn) args = [paths.LDAPPASSWD, '-D', userdn, '-w', oldpw, '-a', oldpw, - '-s', newpw, '-x'] + '-s', newpw, '-x', '-H', api.env.ldap_uri] return run(args)