Change config validator tests to use the shared fixtures

This commit is contained in:
Joseph Schorr 2017-04-24 14:52:30 -04:00
parent 7debd44b54
commit cb3695a629
17 changed files with 59 additions and 117 deletions

View file

@ -6,19 +6,20 @@ from util.morecollections import AttrDict
from test.test_ldap import mock_ldap
from test.fixtures import *
@pytest.mark.parametrize('unvalidated_config', [
({}),
({'AUTHENTICATION_TYPE': 'Database'}),
])
def test_validate_noop(unvalidated_config):
def test_validate_noop(unvalidated_config, app):
LDAPValidator.validate(unvalidated_config, None, None)
@pytest.mark.parametrize('unvalidated_config', [
({'AUTHENTICATION_TYPE': 'LDAP'}),
({'AUTHENTICATION_TYPE': 'LDAP', 'LDAP_ADMIN_DN': 'foo'}),
])
def test_invalid_config(unvalidated_config):
def test_invalid_config(unvalidated_config, app):
with pytest.raises(ConfigValidationException):
LDAPValidator.validate(unvalidated_config, None, None)
@ -28,7 +29,7 @@ def test_invalid_config(unvalidated_config):
'http://foo',
'ldap:foo',
])
def test_invalid_uri(uri):
def test_invalid_uri(uri, app):
config = {}
config['AUTHENTICATION_TYPE'] = 'LDAP'
config['LDAP_BASE_DN'] = ['dc=quay', 'dc=io']
@ -47,7 +48,7 @@ def test_invalid_uri(uri):
('invaliduser', 'somepass', ConfigValidationException),
('someuser', 'somepass', None),
])
def test_validated_ldap(username, password, expected_exception):
def test_validated_ldap(username, password, expected_exception, app):
config = {}
config['AUTHENTICATION_TYPE'] = 'LDAP'
config['LDAP_BASE_DN'] = ['dc=quay', 'dc=io']