From efd5836e43ff2f17ca858162b233ce3dd1e68db7 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Thu, 26 Apr 2018 09:04:13 -0700 Subject: [PATCH] fix test --- lemur/dns_providers/service.py | 2 -- lemur/dns_providers/views.py | 1 - lemur/plugins/lemur_acme/tests/test_acme.py | 6 +----- lemur/tests/test_certificates.py | 20 ++++++++++---------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/lemur/dns_providers/service.py b/lemur/dns_providers/service.py index 64cd6782..b79967b8 100644 --- a/lemur/dns_providers/service.py +++ b/lemur/dns_providers/service.py @@ -1,5 +1,3 @@ -import json - from flask import current_app from lemur import database from lemur.dns_providers.models import DnsProviders diff --git a/lemur/dns_providers/views.py b/lemur/dns_providers/views.py index 4eff0ece..13c71faa 100644 --- a/lemur/dns_providers/views.py +++ b/lemur/dns_providers/views.py @@ -78,7 +78,6 @@ class DnsProvidersList(AuthenticatedResource): args['user'] = g.user return service.render(args) - @admin_permission.require(http_exception=403) def delete(self, dns_provider_id): service.delete(dns_provider_id) diff --git a/lemur/plugins/lemur_acme/tests/test_acme.py b/lemur/plugins/lemur_acme/tests/test_acme.py index 7aeef238..938d3144 100644 --- a/lemur/plugins/lemur_acme/tests/test_acme.py +++ b/lemur/plugins/lemur_acme/tests/test_acme.py @@ -1,9 +1,6 @@ import unittest -from acme import challenges - -from lemur.plugins.lemur_acme import plugin, route53, cloudflare -from lemur.plugins.base import plugins +from lemur.plugins.lemur_acme import plugin from mock import MagicMock, Mock, patch @@ -116,4 +113,3 @@ class TestAcme(unittest.TestCase): result_client, result_registration = plugin.setup_acme_client(mock_authority) assert result_client assert result_registration - diff --git a/lemur/tests/test_certificates.py b/lemur/tests/test_certificates.py index 68082f4c..98283a9d 100644 --- a/lemur/tests/test_certificates.py +++ b/lemur/tests/test_certificates.py @@ -153,7 +153,7 @@ def test_certificate_input_schema(client, authority): 'description': 'testtestest', 'validityEnd': arrow.get(2016, 11, 9).isoformat(), 'validityStart': arrow.get(2015, 11, 9).isoformat(), - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -194,7 +194,7 @@ def test_certificate_input_with_extensions(client, authority): ] } }, - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -209,7 +209,7 @@ def test_certificate_out_of_range_date(client, authority): 'authority': {'id': authority.id}, 'description': 'testtestest', 'validityYears': 100, - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -234,7 +234,7 @@ def test_certificate_valid_years(client, authority): 'authority': {'id': authority.id}, 'description': 'testtestest', 'validityYears': 1, - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -250,7 +250,7 @@ def test_certificate_valid_dates(client, authority): 'description': 'testtestest', 'validityStart': '2020-01-01T00:00:00', 'validityEnd': '2020-01-01T00:00:01', - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -267,7 +267,7 @@ def test_certificate_cn_admin(client, authority, logged_in_admin): 'description': 'testtestest', 'validityStart': '2020-01-01T00:00:00', 'validityEnd': '2020-01-01T00:00:01', - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -292,7 +292,7 @@ def test_certificate_allowed_names(client, authority, session, logged_in_user): ] } }, - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -313,7 +313,7 @@ def test_certificate_incative_authority(client, authority, session, logged_in_us 'description': 'testtestest', 'validityStart': '2020-01-01T00:00:00', 'validityEnd': '2020-01-01T00:00:01', - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -338,7 +338,7 @@ def test_certificate_disallowed_names(client, authority, session, logged_in_user ] } }, - 'dns_provider': None, + 'dnsProvider': None, } data, errors = CertificateInputSchema().load(input_data) @@ -357,7 +357,7 @@ def test_certificate_sensitive_name(client, authority, session, logged_in_user): 'description': 'testtestest', 'validityStart': '2020-01-01T00:00:00', 'validityEnd': '2020-01-01T00:00:01', - 'dns_provider': None, + 'dnsProvider': None, } session.add(Domain(name='sensitive.example.com', sensitive=True))