From 71df1718364c4813d39bea712f6387d6a5d10c72 Mon Sep 17 00:00:00 2001 From: Yuvaraju Meenuga Date: Mon, 4 Feb 2019 23:06:37 +0530 Subject: [PATCH] Fix failing Flake8 tests Correct existing code to reflect PEP-8 standards so that Flake8 tests will pass. Setting max_line_length property of PEP-8 to 119 from default 79. --- poppy/distributed_task/taskflow/driver.py | 2 +- .../taskflow/flow/create_ssl_certificate.py | 2 +- .../taskflow/flow/delete_ssl_certificate.py | 2 +- .../taskflow/flow/recreate_ssl_certificate.py | 2 +- .../taskflow/task/create_service_tasks.py | 3 +- .../taskflow/task/delete_service_tasks.py | 4 +- .../task/delete_ssl_certificate_tasks.py | 8 +- .../taskflow/task/update_service_tasks.py | 6 +- poppy/dns/rackspace/services.py | 2 +- poppy/manager/default/background_job.py | 20 +- poppy/manager/default/ssl_certificate.py | 12 +- .../check_cert_status_and_update_tasks.py | 1 - .../update_property/update_property_tasks.py | 2 +- poppy/provider/akamai/certificates.py | 21 +- .../provider/akamai/geo_zone_code_mapping.py | 14 +- poppy/provider/akamai/services.py | 3 +- poppy/storage/cassandra/certificates.py | 2 +- poppy/storage/cassandra/services.py | 3 +- poppy/transport/pecan/controllers/root.py | 6 +- poppy/transport/pecan/controllers/v1/admin.py | 4 +- poppy/transport/validators/helpers.py | 3 +- setup.cfg | 7 + tests/api/base.py | 7 +- tests/api/services/test_services.py | 4 +- .../distributed_task/taskflow/test_flows.py | 3 +- tests/unit/dns/default/test_services.py | 165 +++--- tests/unit/dns/rackspace/test_services.py | 517 +++++++++--------- tests/unit/manager/default/test_services.py | 4 +- .../model/helpers/test_provider_details.py | 3 +- .../akamai/background_jobs/akamai_mocks.py | 31 +- .../test_cassandra_cert_info_storage.py | 4 +- .../unit/provider/akamai/test_certificates.py | 5 +- tests/unit/provider/akamai/test_services.py | 3 +- .../storage/cassandra/test_certificates.py | 2 +- tools/colorizer.py | 19 +- 35 files changed, 460 insertions(+), 436 deletions(-) diff --git a/poppy/distributed_task/taskflow/driver.py b/poppy/distributed_task/taskflow/driver.py index 93d47ebb..4a8485dc 100644 --- a/poppy/distributed_task/taskflow/driver.py +++ b/poppy/distributed_task/taskflow/driver.py @@ -64,7 +64,7 @@ def __init__(self, conf): # This topic could become more complicated "board": self.distributed_task_conf.jobboard_backend_type, "hosts": job_backends_hosts, - "path": self.distributed_task_conf.poppy_service_worker_path, + "path": self.distributed_task_conf.poppy_service_worker_path, } persistence_backends_hosts = ','.join(['%s:%s' % ( diff --git a/poppy/distributed_task/taskflow/flow/create_ssl_certificate.py b/poppy/distributed_task/taskflow/flow/create_ssl_certificate.py index 676d4854..45118449 100644 --- a/poppy/distributed_task/taskflow/flow/create_ssl_certificate.py +++ b/poppy/distributed_task/taskflow/flow/create_ssl_certificate.py @@ -36,7 +36,7 @@ def create_ssl_certificate(): linear_flow.Flow("Provision poppy ssl certificate", retry=retry.Times(5)).add( create_ssl_certificate_tasks.CreateProviderSSLCertificateTask() - ), + ), create_ssl_certificate_tasks.SendNotificationTask(), create_ssl_certificate_tasks.UpdateCertInfoTask() ) diff --git a/poppy/distributed_task/taskflow/flow/delete_ssl_certificate.py b/poppy/distributed_task/taskflow/flow/delete_ssl_certificate.py index 32500a19..bfe992ba 100644 --- a/poppy/distributed_task/taskflow/flow/delete_ssl_certificate.py +++ b/poppy/distributed_task/taskflow/flow/delete_ssl_certificate.py @@ -36,7 +36,7 @@ def delete_ssl_certificate(): linear_flow.Flow("Deleting poppy ssl certificate", retry=retry.Times(5)).add( delete_ssl_certificate_tasks.DeleteProviderSSLCertificateTask() - ), + ), delete_ssl_certificate_tasks.SendNotificationTask(), delete_ssl_certificate_tasks.DeleteStorageSSLCertificateTask() ) diff --git a/poppy/distributed_task/taskflow/flow/recreate_ssl_certificate.py b/poppy/distributed_task/taskflow/flow/recreate_ssl_certificate.py index 55bd6616..345b0bfa 100644 --- a/poppy/distributed_task/taskflow/flow/recreate_ssl_certificate.py +++ b/poppy/distributed_task/taskflow/flow/recreate_ssl_certificate.py @@ -38,7 +38,7 @@ def recreate_ssl_certificate(): linear_flow.Flow("Provision poppy ssl certificate", retry=retry.Times(5)).add( create_ssl_certificate_tasks.CreateProviderSSLCertificateTask() - ), + ), create_ssl_certificate_tasks.SendNotificationTask(), create_ssl_certificate_tasks.UpdateCertInfoTask() ) diff --git a/poppy/distributed_task/taskflow/task/create_service_tasks.py b/poppy/distributed_task/taskflow/task/create_service_tasks.py index ab65e2b4..92c55a5c 100644 --- a/poppy/distributed_task/taskflow/task/create_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/create_service_tasks.py @@ -75,11 +75,10 @@ def execute(self, providers_list_json, project_id, service_id): project_id=project_id, flavor_id=service_obj.flavor_id, cert_type=domain.certificate - )) + )) except ValueError: domain.cert_info = None - responders = [] # try to create all service from each provider for provider in providers_list: diff --git a/poppy/distributed_task/taskflow/task/delete_service_tasks.py b/poppy/distributed_task/taskflow/task/delete_service_tasks.py index ab5a4053..70473457 100644 --- a/poppy/distributed_task/taskflow/task/delete_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/delete_service_tasks.py @@ -83,7 +83,7 @@ def execute(self, provider_details, retry_sleep_time, for provider in provider_details: provider_details[provider] = ( req_provider_details.load_from_json(provider_details[provider]) - ) + ) # delete associated cname records from DNS dns_responder = dns.delete( @@ -171,7 +171,7 @@ def execute(self, responders, dns_responder, provider_details): for provider in provider_details: provider_details[provider] = ( req_provider_details.load_from_json(provider_details[provider]) - ) + ) for responder in responders: provider_name = list(responder.items())[0][0] diff --git a/poppy/distributed_task/taskflow/task/delete_ssl_certificate_tasks.py b/poppy/distributed_task/taskflow/task/delete_ssl_certificate_tasks.py index 69cc4cf3..56ade5e8 100644 --- a/poppy/distributed_task/taskflow/task/delete_ssl_certificate_tasks.py +++ b/poppy/distributed_task/taskflow/task/delete_ssl_certificate_tasks.py @@ -25,6 +25,7 @@ conf = cfg.CONF conf(project='poppy', prog='poppy', args=[]) + class DeleteProviderSSLCertificateTask(task.Task): default_provides = "responders" @@ -38,7 +39,7 @@ def execute(self, providers_list, domain_name, cert_type, cert_obj = self.storage_controller.get_certs_by_domain(domain_name) except ValueError: cert_obj = ssl_certificate.SSLCertificate(flavor_id, domain_name, - cert_type, project_id) + cert_type, project_id) responders = [] # try to delete all certificates from each provider @@ -54,8 +55,8 @@ def execute(self, providers_list, domain_name, cert_type, if responder: if 'error' in responder[provider]: msg = "Failed to delete ssl certificate: {0} : due to {1}:" \ - "The delete operation will be retried".format( - cert_obj.to_dict(), responder[provider]['error']) + "The delete operation will be retried" \ + .format(cert_obj.to_dict(), responder[provider]['error']) LOG.info(msg) raise Exception(msg) @@ -63,6 +64,7 @@ def execute(self, providers_list, domain_name, cert_type, return responders + class SendNotificationTask(task.Task): def execute(self, project_id, responders, domain_name, cert_type): diff --git a/poppy/distributed_task/taskflow/task/update_service_tasks.py b/poppy/distributed_task/taskflow/task/update_service_tasks.py index 28452579..c2d353eb 100644 --- a/poppy/distributed_task/taskflow/task/update_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/update_service_tasks.py @@ -362,8 +362,7 @@ def execute(self, service_old, service_obj, project_id): service_old = service.load_from_json(service_old_json) old_domains = set([ domain.domain for domain in service_old.domains - if domain.protocol == 'https' - and + if domain.protocol == 'https' and domain.certificate in ['san', 'sni'] ]) @@ -372,8 +371,7 @@ def execute(self, service_old, service_obj, project_id): service_new = service.load_from_json(service_new_json) new_domains = set([ domain.domain for domain in service_new.domains - if domain.protocol == 'https' - and + if domain.protocol == 'https' and domain.certificate in ['san', 'sni'] ]) diff --git a/poppy/dns/rackspace/services.py b/poppy/dns/rackspace/services.py index 534b4af6..d23c870f 100644 --- a/poppy/dns/rackspace/services.py +++ b/poppy/dns/rackspace/services.py @@ -190,7 +190,7 @@ def _search_cname_record(self, access_url, shared_ssl_flag): else: suffix = self._driver.rackdns_conf.url # Note: use rindex to find last occurrence of the suffix - shard_name = access_url[:access_url.rindex(suffix)-1].split('.')[-1] + shard_name = access_url[:access_url.rindex(suffix) - 1].split('.')[-1] subdomain_name = '.'.join([shard_name, suffix]) # for sharding is disabled, the suffix is the subdomain_name diff --git a/poppy/manager/default/background_job.py b/poppy/manager/default/background_job.py index 18ed5c04..83071584 100644 --- a/poppy/manager/default/background_job.py +++ b/poppy/manager/default/background_job.py @@ -172,11 +172,11 @@ def post_job(self, job_type, kwargs): try: self.cert_storage.get_certs_by_domain( - cert_obj.domain_name, - project_id=cert_obj.project_id, - flavor_id=cert_obj.flavor_id, - cert_type=cert_obj.cert_type - ) + cert_obj.domain_name, + project_id=cert_obj.project_id, + flavor_id=cert_obj.flavor_id, + cert_type=cert_obj.cert_type + ) except ValueError: ignore_list.append(cert_dict) LOG.info( @@ -336,11 +336,11 @@ def post_job(self, job_type, kwargs): try: self.cert_storage.get_certs_by_domain( - cert_obj.domain_name, - project_id=cert_obj.project_id, - flavor_id=cert_obj.flavor_id, - cert_type=cert_obj.cert_type - ) + cert_obj.domain_name, + project_id=cert_obj.project_id, + flavor_id=cert_obj.flavor_id, + cert_type=cert_obj.cert_type + ) except ValueError: ignore_list.append(cert_dict) LOG.info( diff --git a/poppy/manager/default/ssl_certificate.py b/poppy/manager/default/ssl_certificate.py index 18ff50bc..47bd2eb6 100644 --- a/poppy/manager/default/ssl_certificate.py +++ b/poppy/manager/default/ssl_certificate.py @@ -115,7 +115,6 @@ def get_certs_info_by_domain(self, domain_name, project_id): domain_name=domain_name, project_id=project_id) - def get_san_retry_list(self): if 'akamai' in self._driver.providers: akamai_driver = self._driver.providers['akamai'].obj @@ -127,9 +126,9 @@ def get_san_retry_list(self): res = [json.loads(r) for r in res] return [ {"domain_name": r['domain_name'], - "project_id": r['project_id'], - "flavor_id": r['flavor_id'], - "cert_type": r['cert_type'], + "project_id": r['project_id'], + "flavor_id": r['flavor_id'], + "cert_type": r['cert_type'], "validate_service": r.get('validate_service', True)} for r in res ] @@ -151,16 +150,15 @@ def update_san_retry_list(self, queue_data_list): r['domain_name']) except ValueError: LOG.info("No matching certificates found for " - "the domain {}".format(r['domain_name'])) + "the domain {}".format(r['domain_name'])) if cert_for_domain: if cert_for_domain.get_cert_status() == "deployed": raise ValueError(u'Cert on {0} already exists'. format(r['domain_name'])) - new_queue_data = [ - json.dumps({'flavor_id': r['flavor_id'], # flavor_id + json.dumps({'flavor_id': r['flavor_id'], # flavor_id 'domain_name': r['domain_name'], # domain_name 'project_id': r['project_id'], 'validate_service': r.get('validate_service', True)}) diff --git a/poppy/provider/akamai/background_jobs/check_cert_status_and_update/check_cert_status_and_update_tasks.py b/poppy/provider/akamai/background_jobs/check_cert_status_and_update/check_cert_status_and_update_tasks.py index b656bba4..a884dbed 100644 --- a/poppy/provider/akamai/background_jobs/check_cert_status_and_update/check_cert_status_and_update_tasks.py +++ b/poppy/provider/akamai/background_jobs/check_cert_status_and_update/check_cert_status_and_update_tasks.py @@ -45,7 +45,6 @@ def execute(self, domain_name, cert_type, flavor_id, project_id): return "" - class CheckCertStatusTask(task.Task): default_provides = "status_change_to" diff --git a/poppy/provider/akamai/background_jobs/update_property/update_property_tasks.py b/poppy/provider/akamai/background_jobs/update_property/update_property_tasks.py index 800a2c0d..01a5cee2 100644 --- a/poppy/provider/akamai/background_jobs/update_property/update_property_tasks.py +++ b/poppy/provider/akamai/background_jobs/update_property/update_property_tasks.py @@ -112,7 +112,7 @@ def execute(self, property_spec): raise RuntimeError('PAPI API request failed.' 'Exception: %s' % resp.text) LOG.info("New version for : %s is %s" % (self.property_id, - str(max_version+1))) + str(max_version + 1))) return max_version + 1 diff --git a/poppy/provider/akamai/certificates.py b/poppy/provider/akamai/certificates.py index cccee8f1..cba1bb7e 100644 --- a/poppy/provider/akamai/certificates.py +++ b/poppy/provider/akamai/certificates.py @@ -127,8 +127,8 @@ def create_certificate(self, cert_obj, enqueue=True, https_upgrade=False): # default san_cert_hostname_limit to the value provided in # the config file. san_cert_hostname_limit = ( - san_cert_hostname_limit or - self.driver.san_cert_hostname_limit + san_cert_hostname_limit or + self.driver.san_cert_hostname_limit ) # Check san_cert to enforce number of hosts hasn't @@ -402,8 +402,8 @@ def create_sni_certificate(self, cert_obj, enqueue, https_upgrade): cert_name)) continue cert_hostname_limit = ( - cert_hostname_limit or - self.driver.san_cert_hostname_limit + cert_hostname_limit or + self.driver.san_cert_hostname_limit ) host_names_count = utils.get_ssl_number_of_hosts_alternate( @@ -601,9 +601,7 @@ def delete_certificate(self, cert_obj): if len(resp_json['pendingChanges']) > 0: status = "{0} has pending changes, skipping .." \ "{1} delete will be deferred until the" \ - "{0} becomes available again".format( - found_cert, cert_obj.domain_name - ) + "{0} becomes available again".format(found_cert, cert_obj.domain_name) LOG.info(status) return self.responder.failed(status) @@ -633,9 +631,8 @@ def delete_certificate(self, cert_obj): enrollment_id, resp.text)) if resp.status_code != 202: status = "Certificate delete for {0} failed. " \ - "Status code {1}. Response {2}.".format( - cert_obj.domain_name, resp.status_code, resp.text - ) + "Status code {1}. Response {2}."\ + .format(cert_obj.domain_name, resp.status_code, resp.text) LOG.error(status) return self.responder.failed(status) else: @@ -730,8 +727,7 @@ def _cancel_pending_change(self, cert_obj): headers = { 'Accept': 'application/vnd.akamai.cps.change-id.v1+json' } - cps_cancel_url = self.driver.akamai_conf.policy_api_base_url + \ - change_url[1:] + cps_cancel_url = self.driver.akamai_conf.policy_api_base_url + change_url[1:] cancel_cps = self.cps_api_client.delete(cps_cancel_url, headers=headers) if cancel_cps.ok: @@ -750,4 +746,3 @@ def _cancel_pending_change(self, cert_obj): "again through retry logic".format(change_url) LOG.info(status) return self.responder.failed(status) - diff --git a/poppy/provider/akamai/geo_zone_code_mapping.py b/poppy/provider/akamai/geo_zone_code_mapping.py index cf1d631e..2931454c 100644 --- a/poppy/provider/akamai/geo_zone_code_mapping.py +++ b/poppy/provider/akamai/geo_zone_code_mapping.py @@ -20,13 +20,13 @@ LOG = log.getLogger(__name__) REGIONS = [ - 'North America', - 'South America', - 'EMEA', - 'Japan', - 'India', - 'Australia', - 'APAC'] + 'North America', + 'South America', + 'EMEA', + 'Japan', + 'India', + 'Australia', + 'APAC'] REGION_COUNTRY_MAPPING = { 'North America': [ diff --git a/poppy/provider/akamai/services.py b/poppy/provider/akamai/services.py index 14b485ec..4c7553fa 100644 --- a/poppy/provider/akamai/services.py +++ b/poppy/provider/akamai/services.py @@ -980,8 +980,7 @@ def _get_behavior_value(self, entity, rule_entries): '%s' % geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(zone, '') for zone in zones_list - if geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(zone, '') - != ''] + if geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(zone, '') != ''] if len(country_code_list) > len(set(country_code_list)): raise ValueError("Duplicated country code in %s" % str(country_code_list)) diff --git a/poppy/storage/cassandra/certificates.py b/poppy/storage/cassandra/certificates.py index 7eee6a77..4d80b42b 100644 --- a/poppy/storage/cassandra/certificates.py +++ b/poppy/storage/cassandra/certificates.py @@ -281,7 +281,7 @@ def get_certs_by_domain(self, domain_name, project_id=None, "the domain {}".format(domain_name)) return ssl_cert - except: + except Exception: raise ValueError("No matching certificates found for " "the domain {}".format(domain_name)) diff --git a/poppy/storage/cassandra/services.py b/poppy/storage/cassandra/services.py index 568f206e..0f246815 100644 --- a/poppy/storage/cassandra/services.py +++ b/poppy/storage/cassandra/services.py @@ -1028,8 +1028,7 @@ def format_result(result): domains = [json.loads(d) for d in result.get('domains', []) or []] restrictions = [json.loads(r) for r in result.get('restrictions', []) or []] - caching_rules = [json.loads(c) for c in result.get('caching_rules', []) - or []] + caching_rules = [json.loads(c) for c in result.get('caching_rules', []) or []] log_delivery = json.loads(result.get('log_delivery', '{}') or '{}') operator_status = result.get('operator_status', 'enabled') diff --git a/poppy/transport/pecan/controllers/root.py b/poppy/transport/pecan/controllers/root.py index 08d6c23a..548a5964 100644 --- a/poppy/transport/pecan/controllers/root.py +++ b/poppy/transport/pecan/controllers/root.py @@ -36,9 +36,9 @@ def _route(self, args, request=None): # Remove it from the URL if it's present # ['v1.0', 'services'] or ['v1', '123', 'services'] if ( - len(args) >= 2 - and args[0] in self.paths - and re.match('^[0-9]+$', args[1]) + len(args) >= 2 and + args[0] in self.paths and + re.match('^[0-9]+$', args[1]) ): args.pop(1) diff --git a/poppy/transport/pecan/controllers/v1/admin.py b/poppy/transport/pecan/controllers/v1/admin.py index cb94cc17..5e89055d 100644 --- a/poppy/transport/pecan/controllers/v1/admin.py +++ b/poppy/transport/pecan/controllers/v1/admin.py @@ -209,7 +209,7 @@ def put(self): self.manager.background_job_controller. put_san_mapping_list(san_mapping_list)) # queue is the new queue, and deleted is deleted items - return {"queue": res, "deleted": deleted} + return {"queue": res, "deleted": deleted} except Exception as e: pecan.abort(400, str(e)) @@ -272,7 +272,7 @@ def put(self): self._driver.manager.ssl_certificate_controller. update_san_retry_list(queue_data)) # queue is the new queue, and deleted is deleted items - return {"queue": res, "deleted": deleted} + return {"queue": res, "deleted": deleted} except Exception as e: pecan.abort(400, str(e)) diff --git a/poppy/transport/validators/helpers.py b/poppy/transport/validators/helpers.py index f3a97bf5..bd9f4b7e 100644 --- a/poppy/transport/validators/helpers.py +++ b/poppy/transport/validators/helpers.py @@ -572,8 +572,7 @@ def is_valid_flavor_id(flavor_id): @decorators.validation_function def is_valid_analytics_request(request): default_end_time = datetime.datetime.utcnow() - default_start_time = (datetime.datetime.utcnow() - - datetime.timedelta(days=1)) + default_start_time = (datetime.datetime.utcnow() - datetime.timedelta(days=1)) domain = request.GET.get('domain', "") startTime = request.GET.get('startTime', default_start_time.strftime( diff --git a/setup.cfg b/setup.cfg index 4b5efc82..ed6d17dd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -85,3 +85,10 @@ universal = 1 ; method in nose/inspector.py requires a traceback-like object. ; ; detailed-errors = 1 + +[flake8] +exclude = .git,*migrations* +max-line-length = 119 +; Ignore H202 [assertRaises Exception too broad] warning +; Ignore E731 [do not assign a lambda expression, use a def] +ignore = H202,E731 diff --git a/tests/api/base.py b/tests/api/base.py index 72c45162..72d2c457 100644 --- a/tests/api/base.py +++ b/tests/api/base.py @@ -248,11 +248,10 @@ def assert_patch_service_details(self, actual_response, expected_response): in expected_response['domains'] if ( b_item['domain'] == - item['domain']) - or (b_item.get('certificate') == + item['domain']) or + (b_item.get('certificate') == 'shared' and - item['domain'].split('.')[0] - == b_item['domain'])) + item['domain'].split('.')[0] == b_item['domain'])) if item['certificate'] == 'shared': matched_domain_in_body['domain'] = item['domain'] matched_domain_in_body["certificate_status"] = ( diff --git a/tests/api/services/test_services.py b/tests/api/services/test_services.py index 665da640..ae09521a 100644 --- a/tests/api/services/test_services.py +++ b/tests/api/services/test_services.py @@ -95,8 +95,8 @@ def test_create_service_positive(self, test_data): in body['domains'] if ( b_item['domain'] == - item['domain']) - or (b_item.get('certificate') == + item['domain']) or + (b_item.get('certificate') == 'shared' and item['domain'] == b_item['domain'] diff --git a/tests/unit/distributed_task/taskflow/test_flows.py b/tests/unit/distributed_task/taskflow/test_flows.py index 469b233a..bbe340ef 100644 --- a/tests/unit/distributed_task/taskflow/test_flows.py +++ b/tests/unit/distributed_task/taskflow/test_flows.py @@ -221,8 +221,7 @@ def patch_delete_ssl_certificate_retry_flow( ssl_cert_controller.storage.delete_certificate = mock.Mock() storage_controller._driver.close_connection = mock.Mock() service_controller.provider_wrapper.delete_certificate = mock.Mock() - service_controller.provider_wrapper.delete_certificate. \ - _mock_return_value = { + service_controller.provider_wrapper.delete_certificate._mock_return_value = { "cdn_provider": { 'error': "", 'error_detail': "" diff --git a/tests/unit/dns/default/test_services.py b/tests/unit/dns/default/test_services.py index b2e987da..c8944d1f 100644 --- a/tests/unit/dns/default/test_services.py +++ b/tests/unit/dns/default/test_services.py @@ -54,25 +54,27 @@ def test_create_with_no_links(self): def test_create_with_provider_error(self): - responders = [{ - 'Akamai': { - 'error': 'Create service failed with Akamai', - 'error_detail': 'Error details' - }, - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ + responders = [ + { + 'Akamai': { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' + 'error': 'Create service failed with Akamai', + 'error_detail': 'Error details' }, - { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] subdomain = mock.Mock() @@ -86,21 +88,23 @@ def test_create_with_provider_error(self): def test_create(self): domain_names = [u'blog.mocksite.com', u'test.mocksite.com'] - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - }, + responders = [ + { + 'Fastly': { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] subdomain = mock.Mock() @@ -213,11 +217,13 @@ def test_update_remove_domains_provider_error(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'error': 'Create service failed' - } + responders = [ + { + 'Fastly': + { + 'id': str(uuid.uuid4()), + 'error': 'Create service failed' + } }] dns_details = self.controller.update(self.service_old, @@ -236,16 +242,19 @@ def test_update_remove_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ + responders = [ + { + 'Fastly': { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ] } - ]} }] dns_details = self.controller.update(self.service_old, @@ -273,21 +282,24 @@ def test_update_same_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, + responders = [ + { + 'Fastly': { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ] } - ]} }] dns_details = self.controller.update(self.service_old, @@ -322,26 +334,29 @@ def test_update_add_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, + responders = [ + { + 'Fastly': { - 'domain': u'pictures.domain.com', - 'href': u'pictures.domain.com.global.prod.fastly.net', - 'rel': 'access_url' + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'pictures.domain.com', + 'href': u'pictures.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ] } - ]} }] dns_details = self.controller.update( diff --git a/tests/unit/dns/rackspace/test_services.py b/tests/unit/dns/rackspace/test_services.py index df9dc8ab..c7bedcc0 100644 --- a/tests/unit/dns/rackspace/test_services.py +++ b/tests/unit/dns/rackspace/test_services.py @@ -105,25 +105,27 @@ def test_create_with_no_links(self): def test_create_with_provider_error(self): - responders = [{ - 'Akamai': { - 'error': 'Create service failed with Akamai', - 'error_detail': 'Error details' - }, - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ + responders = [ + { + 'Akamai': { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' + 'error': 'Create service failed with Akamai', + 'error_detail': 'Error details' }, - { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] subdomain = mock.Mock() @@ -139,21 +141,22 @@ def test_create_with_provider_error(self): def test_create_with_subdomain_not_found_exception(self): domain_names = [u'blog.mocksite.com', u'test.mocksite.com'] - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] self.client.find = mock.Mock( @@ -175,21 +178,22 @@ def test_create_with_subdomain_not_found_exception(self): access_urls_map[provider_name][domain_name]) def test_create_with_generic_exception(self): - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] subdomain = mock.Mock() @@ -206,31 +210,32 @@ def test_create_with_generic_exception(self): def test_create(self): domain_names = [u'blog.mocksite.com', u'test.mocksite.com'] - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.mocksite.com', - 'href': u'blog.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'test.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'href': 'https://cloudfiles.rackspace/CONTAINER/OBJ', - 'rel': 'log_delivery' - }, - { - 'domain': u'shared.mocksite.com', - 'href': u'test.mocksite.com.global.prod.fastly.net', - 'certificate': 'shared', - 'rel': 'access_url' - }, - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.mocksite.com', + 'href': u'blog.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'href': 'https://cloudfiles.rackspace/CONTAINER/OBJ', + 'rel': 'log_delivery' + }, + { + 'domain': u'shared.mocksite.com', + 'href': u'test.mocksite.com.global.prod.fastly.net', + 'certificate': 'shared', + 'rel': 'access_url' + }, + ]} }] subdomain = mock.Mock() @@ -604,26 +609,27 @@ def test_update_add_domains_with_dns_exception(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'pictures.domain.com', - 'href': u'pictures.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'pictures.domain.com', + 'href': u'pictures.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update(self.service_old, @@ -652,26 +658,27 @@ def test_update_add_domains_with_no_domains_in_update(self): flavor_id='standard' ) - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'pictures.domain.com', - 'href': u'pictures.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'pictures.domain.com', + 'href': u'pictures.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update( @@ -699,11 +706,13 @@ def test_update_remove_domains_provider_error(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'error': 'Create service failed' - } + responders = [ + { + 'Fastly': + { + 'id': str(uuid.uuid4()), + 'error': 'Create service failed' + } }] dns_details = self.controller.update(self.service_old, @@ -743,21 +752,22 @@ def test_update_remove_domains_with_subdomain_not_found_exception(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update(self.service_old, @@ -787,16 +797,17 @@ def test_update_remove_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update(self.service_old, @@ -824,21 +835,22 @@ def test_update_same_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update(self.service_old, @@ -875,28 +887,29 @@ def test_update_add_domains(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'pictures.domain.com', - 'href': u'pictures.domain.com.global.prod.fastly.net', - 'rel': 'access_url', - 'certificate': 'san', - 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'pictures.domain.com', + 'href': u'pictures.domain.com.global.prod.fastly.net', + 'rel': 'access_url', + 'certificate': 'san', + 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' + } + ]} }] dns_details = self.controller.update(self.service_old, @@ -934,23 +947,24 @@ def test_update_add_domains_http_to_https_upgrade(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url', - 'certificate': 'san', - 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url', + 'certificate': 'san', + 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' + } + ]} }] dns_details = self.controller.update( @@ -993,23 +1007,24 @@ def test_update_add_domains_https_upgrade_regex_exception(self, re_mock): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url', - 'certificate': 'san', - 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url', + 'certificate': 'san', + 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' + } + ]} }] dns_details = self.controller.update( @@ -1043,23 +1058,24 @@ def test_update_add_domains_https_upgrade_create_cname_record(self): origins=[], flavor_id='standard') - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url', - 'certificate': 'san', - 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url', + 'certificate': 'san', + 'old_operator_url': 'old.operator.url.cdn99.mycdn.com' + } + ]} }] dns_details = self.controller.update( @@ -1100,26 +1116,27 @@ def test_update_add_domains_keeps_log_delivery(self): log_delivery=log_delivery.LogDelivery(enabled=True) ) self.service_old.log_delivery = log_delivery.LogDelivery(enabled=True) - responders = [{ - 'Fastly': { - 'id': str(uuid.uuid4()), - 'links': [ - { - 'domain': u'test.domain.com', - 'href': u'test.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'blog.domain.com', - 'href': u'blog.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - }, - { - 'domain': u'pictures.domain.com', - 'href': u'pictures.domain.com.global.prod.fastly.net', - 'rel': 'access_url' - } - ]} + responders = [ + { + 'Fastly': { + 'id': str(uuid.uuid4()), + 'links': [ + { + 'domain': u'test.domain.com', + 'href': u'test.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'blog.domain.com', + 'href': u'blog.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + }, + { + 'domain': u'pictures.domain.com', + 'href': u'pictures.domain.com.global.prod.fastly.net', + 'rel': 'access_url' + } + ]} }] dns_details = self.controller.update(self.service_old, diff --git a/tests/unit/manager/default/test_services.py b/tests/unit/manager/default/test_services.py index 6532c4c8..b23ed720 100644 --- a/tests/unit/manager/default/test_services.py +++ b/tests/unit/manager/default/test_services.py @@ -641,9 +641,9 @@ def get_provider_extension_by_name(name): } ] } - ] - } + ] } + } with MonkeyPatchControllers(self.sc, self.sc.dns_controller, self.sc.storage_controller, diff --git a/tests/unit/model/helpers/test_provider_details.py b/tests/unit/model/helpers/test_provider_details.py index ecd51b88..c0dac75d 100644 --- a/tests/unit/model/helpers/test_provider_details.py +++ b/tests/unit/model/helpers/test_provider_details.py @@ -68,5 +68,4 @@ def test_get_domain_certificate_status(self, status): self.assertTrue( self.my_provider_detail.domains_certificate_status. - get_domain_certificate_status("www.ab.com") - == status) + get_domain_certificate_status("www.ab.com") == status) diff --git a/tests/unit/provider/akamai/background_jobs/akamai_mocks.py b/tests/unit/provider/akamai/background_jobs/akamai_mocks.py index 5af20c3c..c93c84a4 100644 --- a/tests/unit/provider/akamai/background_jobs/akamai_mocks.py +++ b/tests/unit/provider/akamai/background_jobs/akamai_mocks.py @@ -114,15 +114,16 @@ def get_certs_by_domain(self, domain_name, project_id=None, "san", project_id=project_id, cert_details={ - 'Akamai': { - u'cert_domain': u'secure2.san1.test_123.com', - u'extra_info': { - u'action': u'Waiting for customer domain ' - 'validation for blog.testabc.com', - u'akamai_spsId': str(random.randint(1, 100000)), - u'create_at': u'2015-09-29 16:09:12.429147', - u'san cert': u'secure2.san1.test_123.com', - u'status': u'create_in_progress'} + 'Akamai': + { + u'cert_domain': u'secure2.san1.test_123.com', + u'extra_info': { + u'action': u'Waiting for customer domain ' + 'validation for blog.testabc.com', + u'akamai_spsId': str(random.randint(1, 100000)), + u'create_at': u'2015-09-29 16:09:12.429147', + u'san cert': u'secure2.san1.test_123.com', + u'status': u'create_in_progress'} } } ) @@ -271,7 +272,7 @@ def put(self, url, data=None, headers=None): "edgeHostnameId": "ehn_1126816", "cnameFrom": "secure.san2.test_789.com", "cnameTo": "secure.test_456.com.edge_host_test.net" - }, { + }, { 'cnameTo': 'secure.test_7891.com.edge_host_test.net', 'cnameFrom': 'www.blogyyy.com', 'edgeHostnameId': 'ehn_1126816', @@ -297,10 +298,12 @@ def get(self, url): "requestList": [{"resourceUrl": "/config-secure-provisioning-service/" "v1/sps-requests/1849", - "parameters": [{ - "name": "cnameHostname", - "value": "secure.san3.test_123.com" - }, {"name": "createType", "value": "san"}, + "parameters": [ + { + "name": "cnameHostname", + "value": "secure.san3.test_123.com" + }, + {"name": "createType", "value": "san"}, {"name": "csr.cn", "value": "secure.san3.test_123.com"}, {"name": "csr.c", "value": "US"}, diff --git a/tests/unit/provider/akamai/cert_info_storage/test_cassandra_cert_info_storage.py b/tests/unit/provider/akamai/cert_info_storage/test_cassandra_cert_info_storage.py index 76594710..c931dd9a 100644 --- a/tests/unit/provider/akamai/cert_info_storage/test_cassandra_cert_info_storage.py +++ b/tests/unit/provider/akamai/cert_info_storage/test_cassandra_cert_info_storage.py @@ -190,7 +190,7 @@ def test_get_cert_config(self): self.assertTrue( res['spsId'] == str(json.loads( self.get_returned_value[0]['info']['san_info'] - )[cert_name]['spsId']) + )[cert_name]['spsId']) ) def test_get_sni_cert_info(self): @@ -207,7 +207,7 @@ def test_get_sni_cert_info(self): self.assertTrue( res['enrollmentId'] == str(json.loads( self.get_returned_value[0]['info']['sni_info'] - )[cert_name]['enrollmentId']) + )[cert_name]['enrollmentId']) ) def test_update_cert_config(self): diff --git a/tests/unit/provider/akamai/test_certificates.py b/tests/unit/provider/akamai/test_certificates.py index 99ff56bc..5e4a0312 100644 --- a/tests/unit/provider/akamai/test_certificates.py +++ b/tests/unit/provider/akamai/test_certificates.py @@ -1071,16 +1071,13 @@ def test_cert_delete_sni_cert_pending_changes(self): status = "{0} has pending changes, skipping .." \ "{1} delete will be deferred until the" \ - "{0} becomes available again".format( - "0", cert_obj.domain_name - ) + "{0} becomes available again".format("0", cert_obj.domain_name) self.assertEqual( status, responder['Akamai']['error'] ) - def test_cert_delete_sni_cert_positive(self): cert_obj = ssl_certificate.load_from_json({ diff --git a/tests/unit/provider/akamai/test_services.py b/tests/unit/provider/akamai/test_services.py index b3edf0c4..75990b0e 100644 --- a/tests/unit/provider/akamai/test_services.py +++ b/tests/unit/provider/akamai/test_services.py @@ -754,8 +754,7 @@ def test_purge(self): ) purge_url = '/img/abc.jpeg' actual_purge_url = ("https://" + - json.loads(provider_service_id)[0]['policy_name'] - + purge_url) + json.loads(provider_service_id)[0]['policy_name'] + purge_url) data = { 'objects': [ actual_purge_url diff --git a/tests/unit/storage/cassandra/test_certificates.py b/tests/unit/storage/cassandra/test_certificates.py index 074021b6..9bb67733 100644 --- a/tests/unit/storage/cassandra/test_certificates.py +++ b/tests/unit/storage/cassandra/test_certificates.py @@ -128,7 +128,7 @@ def test_get_certs_by_domain_not_exists(self): Should receive an Exception. """ self.cc.get_certs_by_domain( - domain_name="www.randomdomain.com") + domain_name="www.randomdomain.com") def test_get_certs_by_status(self): # mock the response from cassandra diff --git a/tools/colorizer.py b/tools/colorizer.py index bd0c45b5..68b562d3 100755 --- a/tools/colorizer.py +++ b/tools/colorizer.py @@ -107,15 +107,16 @@ def __init__(self, stream): self.stream = stream self.screenBuffer = win32console.GetStdHandle( win32console.STD_OUT_HANDLE) - self._colors = { - 'normal': red | green | blue, - 'red': red | bold, - 'green': green | bold, - 'blue': blue | bold, - 'yellow': red | green | bold, - 'magenta': red | blue | bold, - 'cyan': green | blue | bold, - 'white': red | green | blue | bold + self._colors = \ + { + 'normal': red | green | blue, + 'red': red | bold, + 'green': green | bold, + 'blue': blue | bold, + 'yellow': red | green | bold, + 'magenta': red | blue | bold, + 'cyan': green | blue | bold, + 'white': red | green | blue | bold } def supported(cls, stream=sys.stdout):