vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change config validator tests to use the shared fixtures

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
util/config/validators/test/test_validate_ssl.py
View file

@ -7,12 +7,14 @@ from util.config.validators import ConfigValidationException
from util.config.validators.validate_ssl import SSLValidator, SSL_FILENAMES
from test.test_ssl_util import generate_test_cert
from test.fixtures import *
@pytest.mark.parametrize('unvalidated_config', [
({}),
({'PREFERRED_URL_SCHEME': 'http'}),
({'PREFERRED_URL_SCHEME': 'https', 'EXTERNAL_TLS_TERMINATION': True}),
])
def test_skip_validate_ssl(unvalidated_config):
def test_skip_validate_ssl(unvalidated_config, app):
validator = SSLValidator()
validator.validate(unvalidated_config, None, None)
@ -23,7 +25,7 @@ def test_skip_validate_ssl(unvalidated_config):
(generate_test_cert(hostname='invalidserver'), ConfigValidationException,
'Supported names "invalidserver" in SSL cert do not match server hostname "someserver"'),
])
def test_validate_ssl(cert, expected_error, error_message):
def test_validate_ssl(cert, expected_error, error_message, app):
with NamedTemporaryFile(delete=False) as cert_file:
cert_file.write(cert[0])
cert_file.seek(0)