From ba4b10b3860e3639ba33bdcee7740539feda7c7c Mon Sep 17 00:00:00 2001
From: Sam Chow <schow@redhat.com>
Date: Mon, 16 Jul 2018 11:18:22 -0400
Subject: [PATCH] Update ldap validation test to match expected behavior

---
 .../validators/test/test_validate_ldap.py     | 21 +++++++++----------
 util/config/validators/validate_ldap.py       |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/util/config/validators/test/test_validate_ldap.py b/util/config/validators/test/test_validate_ldap.py
index f5d5a7425..4738e4c26 100644
--- a/util/config/validators/test/test_validate_ldap.py
+++ b/util/config/validators/test/test_validate_ldap.py
@@ -47,22 +47,21 @@ def test_invalid_uri(uri, app):
     LDAPValidator.validate(config)
 
 
-@pytest.mark.parametrize('username, password, expected_exception', [
-  ('invaliduser', 'invalidpass', ConfigValidationException),
-  ('someuser', 'invalidpass', ConfigValidationException),
-  ('invaliduser', 'somepass', ConfigValidationException),
-  ('someuser', 'somepass', None),
+@pytest.mark.parametrize('admin_dn, admin_passwd, user_rdn, expected_exception', [
+  ('uid=testy,ou=employees,dc=quay,dc=io', 'password', ['ou=employees'], None),
+  ('uid=invalidadmindn', 'password', ['ou=employees'], ConfigValidationException),
+  ('uid=testy,ou=employees,dc=quay,dc=io', 'invalid_password', ['ou=employees'], ConfigValidationException),
+  ('uid=testy,ou=employees,dc=quay,dc=io', 'password', ['ou=invalidgroup'], ConfigValidationException),
 ])
-def test_validated_ldap(username, password, expected_exception, app):
+def test_validated_ldap(admin_dn, admin_passwd, user_rdn, expected_exception, app):
   config = {}
   config['AUTHENTICATION_TYPE'] = 'LDAP'
   config['LDAP_BASE_DN'] = ['dc=quay', 'dc=io']
-  config['LDAP_ADMIN_DN'] = 'uid=testy,ou=employees,dc=quay,dc=io'
-  config['LDAP_ADMIN_PASSWD'] = 'password'
-  config['LDAP_USER_RDN'] = ['ou=employees']
+  config['LDAP_ADMIN_DN'] = admin_dn
+  config['LDAP_ADMIN_PASSWD'] = admin_passwd
+  config['LDAP_USER_RDN'] = user_rdn
 
-  unvalidated_config = ValidatorContext(config, user_password=password, config_provider=config_provider)
-  unvalidated_config.user = AttrDict(dict(username=username))
+  unvalidated_config = ValidatorContext(config, config_provider=config_provider)
 
   if expected_exception is not None:
     with pytest.raises(ConfigValidationException):
diff --git a/util/config/validators/validate_ldap.py b/util/config/validators/validate_ldap.py
index 595487587..7870353d4 100644
--- a/util/config/validators/validate_ldap.py
+++ b/util/config/validators/validate_ldap.py
@@ -13,8 +13,6 @@ class LDAPValidator(BaseValidator):
   def validate(cls, validator_context):
     """ Validates the LDAP connection. """
     config = validator_context.config
-    user = validator_context.user
-    user_password = validator_context.user_password
     config_provider = validator_context.config_provider
     init_scripts_location = validator_context.init_scripts_location