Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8

This commit is contained in:
kevgliss 2015-07-23 09:08:07 -07:00
parent 017eab6e39
commit c02390d63b
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/certificates/service.py
View File

@ -6,8 +6,6 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com> .. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
""" """
import arrow import arrow
import string
import random
from sqlalchemy import func, or_ from sqlalchemy import func, or_
from flask import g, current_app from flask import g, current_app

2
lemur/decorators.py
View File

@ -12,7 +12,7 @@ from functools import update_wrapper
# this is only used for dev # this is only used for dev
def crossdomain(origin=None, methods=None, headers=None, def crossdomain(origin=None, methods=None, headers=None,
max_age=21600, attach_to_all=True, max_age=21600, attach_to_all=True,
automatic_options=True): automatic_options=True): # pragma: no cover
if methods is not None: if methods is not None:
methods = ', '.join(sorted(x.upper() for x in methods)) methods = ', '.join(sorted(x.upper() for x in methods))

3
lemur/plugins/lemur_aws/tests/test_iam.py
View File

@ -1,10 +1,8 @@
import pytest
from moto import mock_iam, mock_sts from moto import mock_iam, mock_sts
from lemur.certificates.models import Certificate from lemur.certificates.models import Certificate
from lemur.tests.certs import EXTERNAL_VALID_STR, PRIVATE_KEY_STR from lemur.tests.certs import EXTERNAL_VALID_STR, PRIVATE_KEY_STR
from lemur.tests.conftest import app # noqa
def test_get_name_from_arn(): def test_get_name_from_arn():
@ -31,4 +29,3 @@ def test_get_cert_from_arn(app):
upload_cert('123456789012', cert, PRIVATE_KEY_STR) upload_cert('123456789012', cert, PRIVATE_KEY_STR)
body, chain = get_cert_from_arn('arn:aws:iam::123456789012:server-certificate/tttt2.netflixtest.net-NetflixInc-20150624-20150625') body, chain = get_cert_from_arn('arn:aws:iam::123456789012:server-certificate/tttt2.netflixtest.net-NetflixInc-20150624-20150625')
assert body.replace('\n', '') == EXTERNAL_VALID_STR.replace('\n', '') assert body.replace('\n', '') == EXTERNAL_VALID_STR.replace('\n', '')

8
lemur/tests/conf.py
View File

@ -54,12 +54,12 @@ LEMUR_INSTANCE_PROFILE = 'Lemur'
# These will be dependent on which 3rd party that Lemur is # These will be dependent on which 3rd party that Lemur is
# configured to use. # configured to use.
#CLOUDCA_URL = '' # CLOUDCA_URL = ''
#CLOUDCA_PEM_PATH = '' # CLOUDCA_PEM_PATH = ''
#CLOUDCA_BUNDLE = '' # CLOUDCA_BUNDLE = ''
# number of years to issue if not specified # number of years to issue if not specified
#CLOUDCA_DEFAULT_VALIDITY = 2 # CLOUDCA_DEFAULT_VALIDITY = 2
VERISIGN_URL = 'http://example.com' VERISIGN_URL = 'http://example.com'
VERISIGN_PEM_PATH = '~/' VERISIGN_PEM_PATH = '~/'

2
lemur/tests/test_authorities.py
View File

@ -148,5 +148,3 @@ def test_admin_authorities_delete(client):
def test_admin_certificate_authorities_get(client): def test_admin_certificate_authorities_get(client):
assert client.get(api.url_for(CertificateAuthority, certificate_id=1), headers=VALID_ADMIN_HEADER_TOKEN).status_code == 404 assert client.get(api.url_for(CertificateAuthority, certificate_id=1), headers=VALID_ADMIN_HEADER_TOKEN).status_code == 404