URL: https://github.com/freeipa/freeipa/pull/404 Author: dkupka Title: #404: tests: Add LDAP URI to ldappasswd explicitly Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/404/head:pr404 git checkout pr404
From d530c8ba1c86dc7e33fad04ad20c03617dd2fce9 Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 19 Jan 2017 09:18:32 +0100 Subject: [PATCH] tests: Add LDAP URI to ldappasswd explicitelly Test should always respect api.env.* values. https://fedorahosted.org/freeipa/ticket/6622 --- ipatests/test_integration/util.py | 3 ++- ipatests/util.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ipatests/test_integration/util.py b/ipatests/test_integration/util.py index 179f672..181e675 100644 --- a/ipatests/test_integration/util.py +++ b/ipatests/test_integration/util.py @@ -21,6 +21,7 @@ import re from ipaplatform.paths import paths +from ipalib import api from ipalib.constants import DEFAULT_CONFIG def run_repeatedly(host, command, assert_zero_rc=True, test=None, @@ -86,5 +87,5 @@ def ldappasswd_user_change(user, oldpw, newpw, master): userdn = "uid={},{},{}".format(user, container_user, basedn) args = [paths.LDAPPASSWD, '-D', userdn, '-w', oldpw, '-a', oldpw, - '-s', newpw, '-x'] + '-s', newpw, '-x', '-H', api.env.ldap_uri] master.run_command(args) diff --git a/ipatests/util.py b/ipatests/util.py index 9320383..2450f13 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -721,7 +721,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)
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
