From 28329f1a0745c07473092922f7f5dd572972d8c6 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@ess.eu>
Date: Fri, 2 Oct 2020 11:17:37 +0200
Subject: [PATCH] Update black and flake8 in pre-commit
---
.pre-commit-config.yaml | 4 +-
app/tasks.py | 12 ++++--
app/utils.py | 4 +-
tests/functional/test_api.py | 78 +++++++++++++++++++++++++++++-------
tests/functional/test_web.py | 4 +-
5 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 924205c..efb8ab5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,9 @@
repos:
- repo: https://github.com/psf/black
- rev: 19.10b0
+ rev: 20.8b1
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
- rev: 3.8.2
+ rev: 3.8.3
hooks:
- id: flake8
diff --git a/app/tasks.py b/app/tasks.py
index 55033e0..655a854 100644
--- a/app/tasks.py
+++ b/app/tasks.py
@@ -106,10 +106,14 @@ def launch_awx_job(resource="job", **kwargs):
if job_template is None and inventory_source is None:
current_app.logger.warning("No job_template nor inventory_source passed!")
return "No job_template nor inventory_source passed!"
- if job_template in (
- current_app.config["AWX_CREATE_VIOC"],
- current_app.config["AWX_CREATE_VM"],
- ) and not current_app.config.get("AWX_VM_CREATION_ENABLED", False):
+ if (
+ job_template
+ in (
+ current_app.config["AWX_CREATE_VIOC"],
+ current_app.config["AWX_CREATE_VM"],
+ )
+ and not current_app.config.get("AWX_VM_CREATION_ENABLED", False)
+ ):
current_app.logger.info("AWX VM creation is disabled. Not sending any request.")
return "AWX VM creation not triggered"
if not current_app.config.get("AWX_JOB_ENABLED", False):
diff --git a/app/utils.py b/app/utils.py
index b05f3cd..1995f55 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -346,7 +346,9 @@ def trigger_ansible_groups_reindex():
Make sure that we don't have more than one in queue.
"""
return trigger_job_once(
- "reindex_ansible_groups", queue_name="low", func="reindex_ansible_groups",
+ "reindex_ansible_groups",
+ queue_name="low",
+ func="reindex_ansible_groups",
)
diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
index 7001ae7..280dc62 100644
--- a/tests/functional/test_api.py
+++ b/tests/functional/test_api.py
@@ -773,7 +773,9 @@ def test_get_networks_normal_user(
)
# Get second page
response = get(
- client, f"{url}?per_page=20&page=2&recursive=False", token=user_token,
+ client,
+ f"{url}?per_page=20&page=2&recursive=False",
+ token=user_token,
)
assert response.status_code == 200
networks2 = response.get_json()
@@ -1453,7 +1455,11 @@ def test_delete_interface_invalid_credentials(client, interface_factory, user_to
def test_delete_interface_success(client, admin_token, interface):
check_delete_success(
- client, admin_token, interface, "network/interfaces", models.Interface,
+ client,
+ admin_token,
+ interface,
+ "network/interfaces",
+ models.Interface,
)
@@ -1840,7 +1846,11 @@ def test_delete_host_invalid_credentials(client, host_factory, user_token):
def test_delete_host_success(client, admin_token, host):
check_delete_success(
- client, admin_token, host, "network/hosts", models.Host,
+ client,
+ admin_token,
+ host,
+ "network/hosts",
+ models.Host,
)
@@ -2211,7 +2221,9 @@ def test_get_hosts_normal_user(
)
# Get second page
response = get(
- client, f"{url}?per_page=20&page=2&recursive=False", token=user_token,
+ client,
+ f"{url}?per_page=20&page=2&recursive=False",
+ token=user_token,
)
assert response.status_code == 200
assert len(response.get_json()) == 20
@@ -2233,7 +2245,9 @@ def test_get_hosts_normal_user(
)
# Get third page
response = get(
- client, f"{url}?per_page=20&page=3&recursive=False", token=user_token,
+ client,
+ f"{url}?per_page=20&page=3&recursive=False",
+ token=user_token,
)
assert response.status_code == 200
assert len(response.get_json()) == 5
@@ -2791,7 +2805,11 @@ def test_patch_network_scope_domain(
def test_delete_item_success(client, admin_token, item):
check_delete_success(
- client, admin_token, item, "inventory/items", models.Item,
+ client,
+ admin_token,
+ item,
+ "inventory/items",
+ models.Item,
)
@@ -2817,25 +2835,41 @@ def test_delete_manufacturer_success(client, admin_token, manufacturer):
def test_delete_model_success(client, admin_token, model):
check_delete_success(
- client, admin_token, model, "inventory/models", models.Model,
+ client,
+ admin_token,
+ model,
+ "inventory/models",
+ models.Model,
)
def test_delete_location_success(client, admin_token, location):
check_delete_success(
- client, admin_token, location, "inventory/locations", models.Location,
+ client,
+ admin_token,
+ location,
+ "inventory/locations",
+ models.Location,
)
def test_delete_status_success(client, admin_token, status):
check_delete_success(
- client, admin_token, status, "inventory/statuses", models.Status,
+ client,
+ admin_token,
+ status,
+ "inventory/statuses",
+ models.Status,
)
def test_delete_network_scope_success(client, admin_token, network_scope):
check_delete_success(
- client, admin_token, network_scope, "network/scopes", models.NetworkScope,
+ client,
+ admin_token,
+ network_scope,
+ "network/scopes",
+ models.NetworkScope,
)
@@ -2855,7 +2889,11 @@ def test_delete_network_scope_with_network_fail(
def test_delete_network_success(client, admin_token, network):
check_delete_success(
- client, admin_token, network, "network/networks", models.Network,
+ client,
+ admin_token,
+ network,
+ "network/networks",
+ models.Network,
)
@@ -2875,13 +2913,21 @@ def test_delete_network_with_host_fail(
def test_delete_ansible_group_success(client, admin_token, ansible_group):
check_delete_success(
- client, admin_token, ansible_group, "network/groups", models.AnsibleGroup,
+ client,
+ admin_token,
+ ansible_group,
+ "network/groups",
+ models.AnsibleGroup,
)
def test_delete_domain_success(client, admin_token, domain):
check_delete_success(
- client, admin_token, domain, "network/domains", models.Domain,
+ client,
+ admin_token,
+ domain,
+ "network/domains",
+ models.Domain,
)
@@ -2899,5 +2945,9 @@ def test_delete_domain_with_network_fail(client, domain, network_factory, admin_
def test_delete_cname_success(client, admin_token, cname):
check_delete_success(
- client, admin_token, cname, "network/cnames", models.Cname,
+ client,
+ admin_token,
+ cname,
+ "network/cnames",
+ models.Cname,
)
diff --git a/tests/functional/test_web.py b/tests/functional/test_web.py
index 4a15dba..cae0a44 100644
--- a/tests/functional/test_web.py
+++ b/tests/functional/test_web.py
@@ -298,7 +298,9 @@ def test_retrieve_sensitive_hosts(
logout(client)
# admin users can see all hosts
login(client, "admin", "adminpasswd")
- response = client.post("/network/_retrieve_hosts",)
+ response = client.post(
+ "/network/_retrieve_hosts",
+ )
r = response.get_json()
assert r["recordsTotal"] == 3
assert r["recordsFiltered"] == 3
--
GitLab