Merge pull request #1409 from castrapel/up-reqs-6292018
reformat code (noop)
This commit is contained in:
commit
5c0cc69d22
|
@ -1,8 +1,8 @@
|
||||||
|
from marshmallow import fields
|
||||||
|
|
||||||
from lemur.common.fields import ArrowDateTime
|
from lemur.common.fields import ArrowDateTime
|
||||||
from lemur.common.schema import LemurInputSchema, LemurOutputSchema
|
from lemur.common.schema import LemurInputSchema, LemurOutputSchema
|
||||||
|
|
||||||
from marshmallow import fields
|
|
||||||
|
|
||||||
|
|
||||||
class DnsProvidersNestedOutputSchema(LemurOutputSchema):
|
class DnsProvidersNestedOutputSchema(LemurOutputSchema):
|
||||||
__envelope__ = False
|
__envelope__ = False
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
|
|
||||||
from lemur import database
|
from lemur import database
|
||||||
from lemur.dns_providers.models import DnsProvider
|
from lemur.dns_providers.models import DnsProvider
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ api = Api(mod)
|
||||||
|
|
||||||
class DnsProvidersList(AuthenticatedResource):
|
class DnsProvidersList(AuthenticatedResource):
|
||||||
""" Defines the 'dns_providers' endpoint """
|
""" Defines the 'dns_providers' endpoint """
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.reqparse = reqparse.RequestParser()
|
self.reqparse = reqparse.RequestParser()
|
||||||
super(DnsProvidersList, self).__init__()
|
super(DnsProvidersList, self).__init__()
|
||||||
|
|
|
@ -19,8 +19,8 @@ import OpenSSL.crypto
|
||||||
import josepy as jose
|
import josepy as jose
|
||||||
from acme import challenges, messages
|
from acme import challenges, messages
|
||||||
from acme.client import BackwardsCompatibleClientV2, ClientNetwork
|
from acme.client import BackwardsCompatibleClientV2, ClientNetwork
|
||||||
from acme.messages import Error as AcmeError
|
|
||||||
from acme.errors import PollError, WildcardUnsupportedError
|
from acme.errors import PollError, WildcardUnsupportedError
|
||||||
|
from acme.messages import Error as AcmeError
|
||||||
from botocore.exceptions import ClientError
|
from botocore.exceptions import ClientError
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
|
|
||||||
|
|
|
@ -281,7 +281,8 @@ class TestAcme(unittest.TestCase):
|
||||||
@patch('lemur.plugins.lemur_acme.plugin.finalize_authorizations')
|
@patch('lemur.plugins.lemur_acme.plugin.finalize_authorizations')
|
||||||
@patch('lemur.plugins.lemur_acme.plugin.request_certificate')
|
@patch('lemur.plugins.lemur_acme.plugin.request_certificate')
|
||||||
@patch('lemur.plugins.lemur_acme.plugin.authorization_service')
|
@patch('lemur.plugins.lemur_acme.plugin.authorization_service')
|
||||||
def test_create_certificate(self, mock_authorization_service, mock_request_certificate, mock_finalize_authorizations, mock_get_authorizations,
|
def test_create_certificate(self, mock_authorization_service, mock_request_certificate,
|
||||||
|
mock_finalize_authorizations, mock_get_authorizations,
|
||||||
mock_current_app, mock_dns_provider_service, mock_acme):
|
mock_current_app, mock_dns_provider_service, mock_acme):
|
||||||
provider = plugin.ACMEIssuerPlugin()
|
provider = plugin.ACMEIssuerPlugin()
|
||||||
mock_authority = Mock()
|
mock_authority = Mock()
|
||||||
|
|
Loading…
Reference in New Issue