This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 0d93cc5cab Remove useless string join from tests (#33970)
0d93cc5cab is described below
commit 0d93cc5cab8cef56faf3be1705ec6784e2d8a74a
Author: Hussein Awala <[email protected]>
AuthorDate: Sun Sep 3 11:49:46 2023 +0200
Remove useless string join from tests (#33970)
Co-authored-by: Wei Lee <[email protected]>
---
tests/always/test_connection.py | 2 +-
tests/cli/commands/test_kubernetes_command.py | 2 +-
tests/cli/commands/test_rotate_fernet_key_command.py | 4 ++--
tests/dags/test_clear_subdag.py | 2 +-
tests/models/test_variable.py | 2 +-
.../cncf/kubernetes/utils/test_pod_manager.py | 2 +-
.../providers/google/common/hooks/test_base_google.py | 14 ++------------
tests/utils/test_log_handlers.py | 18 ++++++++----------
8 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/tests/always/test_connection.py b/tests/always/test_connection.py
index 60caa1b3a4..3261ebaeb5 100644
--- a/tests/always/test_connection.py
+++ b/tests/always/test_connection.py
@@ -103,7 +103,7 @@ class TestConnection:
assert Fernet(key1).decrypt(test_connection._extra.encode()) ==
b"testextra"
# Test decrypt of old value with new key
- with conf_vars({("core", "fernet_key"): ",".join([key2.decode(),
key1.decode()])}):
+ with conf_vars({("core", "fernet_key"):
f"{key2.decode()},{key1.decode()}"}):
crypto._fernet = None
assert test_connection.extra == "testextra"
diff --git a/tests/cli/commands/test_kubernetes_command.py
b/tests/cli/commands/test_kubernetes_command.py
index 3d610b3519..ff4d01c892 100644
--- a/tests/cli/commands/test_kubernetes_command.py
+++ b/tests/cli/commands/test_kubernetes_command.py
@@ -59,7 +59,7 @@ class TestGenerateDagYamlCommand:
class TestCleanUpPodsCommand:
- label_selector = ",".join(["dag_id", "task_id", "try_number",
"airflow_version"])
+ label_selector = "dag_id,task_id,try_number,airflow_version"
@classmethod
def setup_class(cls):
diff --git a/tests/cli/commands/test_rotate_fernet_key_command.py
b/tests/cli/commands/test_rotate_fernet_key_command.py
index 2626107d96..82c672160f 100644
--- a/tests/cli/commands/test_rotate_fernet_key_command.py
+++ b/tests/cli/commands/test_rotate_fernet_key_command.py
@@ -61,7 +61,7 @@ class TestRotateFernetKeyCommand:
# Rotate fernet key
with conf_vars(
- {("core", "fernet_key"): ",".join([fernet_key2.decode(),
fernet_key1.decode()])}
+ {("core", "fernet_key"):
f"{fernet_key2.decode()},{fernet_key1.decode()}"}
), mock.patch("airflow.models.crypto._fernet", None):
args = self.parser.parse_args(["rotate-fernet-key"])
rotate_fernet_key_command.rotate_fernet_key(args)
@@ -97,7 +97,7 @@ class TestRotateFernetKeyCommand:
# Rotate fernet key
with conf_vars(
- {("core", "fernet_key"): ",".join([fernet_key2.decode(),
fernet_key1.decode()])}
+ {("core", "fernet_key"):
f"{fernet_key2.decode()},{fernet_key1.decode()}"}
), mock.patch("airflow.models.crypto._fernet", None):
args = self.parser.parse_args(["rotate-fernet-key"])
rotate_fernet_key_command.rotate_fernet_key(args)
diff --git a/tests/dags/test_clear_subdag.py b/tests/dags/test_clear_subdag.py
index 712242cf60..67219aca7b 100644
--- a/tests/dags/test_clear_subdag.py
+++ b/tests/dags/test_clear_subdag.py
@@ -29,7 +29,7 @@ from airflow.operators.subdag import SubDagOperator
def create_subdag_opt(main_dag):
subdag_name = "daily_job"
subdag = DAG(
- dag_id=".".join([dag_name, subdag_name]),
+ dag_id=f"{dag_name}.{subdag_name}",
start_date=start_date,
schedule=None,
max_active_tasks=2,
diff --git a/tests/models/test_variable.py b/tests/models/test_variable.py
index 3242d4e9f6..caf40b8da9 100644
--- a/tests/models/test_variable.py
+++ b/tests/models/test_variable.py
@@ -88,7 +88,7 @@ class TestVariable:
assert Fernet(key1).decrypt(test_var._val.encode()) ==
test_value.encode()
# Test decrypt of old value with new key
- with conf_vars({("core", "fernet_key"): ",".join([key2.decode(),
key1.decode()])}):
+ with conf_vars({("core", "fernet_key"):
f"{key2.decode()},{key1.decode()}"}):
crypto._fernet = None
assert test_var.val == test_value
diff --git a/tests/providers/cncf/kubernetes/utils/test_pod_manager.py
b/tests/providers/cncf/kubernetes/utils/test_pod_manager.py
index 4868f9ca22..a49d90674d 100644
--- a/tests/providers/cncf/kubernetes/utils/test_pod_manager.py
+++ b/tests/providers/cncf/kubernetes/utils/test_pod_manager.py
@@ -251,7 +251,7 @@ class TestPodManager:
assert line == log_message
real_timestamp = "2020-10-08T14:16:17.793417674Z"
- timestamp, line = self.pod_manager.parse_log_line("
".join([real_timestamp, log_message]))
+ timestamp, line = self.pod_manager.parse_log_line(f"{real_timestamp}
{log_message}")
assert timestamp == pendulum.parse(real_timestamp)
assert line == log_message
diff --git a/tests/providers/google/common/hooks/test_base_google.py
b/tests/providers/google/common/hooks/test_base_google.py
index feb9a93a66..897e2f08fd 100644
--- a/tests/providers/google/common/hooks/test_base_google.py
+++ b/tests/providers/google/common/hooks/test_base_google.py
@@ -524,12 +524,7 @@ class TestGoogleBaseHook:
self.instance.extras = {
"project": default_project,
"scope": (
- ",".join(
- (
- "https://www.googleapis.com/auth/bigquery";,
- "https://www.googleapis.com/auth/devstorage.read_only";,
- )
- )
+
"https://www.googleapis.com/auth/bigquery,https://www.googleapis.com/auth/devstorage.read_only";
),
}
@@ -591,12 +586,7 @@ class TestGoogleBaseHook:
self.instance.extras = {
"project": default_project,
"scope": (
- ",".join(
- (
- "https://www.googleapis.com/auth/bigquery";,
- "https://www.googleapis.com/auth/devstorage.read_only";,
- )
- )
+
"https://www.googleapis.com/auth/bigquery,https://www.googleapis.com/auth/devstorage.read_only";
),
}
diff --git a/tests/utils/test_log_handlers.py b/tests/utils/test_log_handlers.py
index 4845c83f7e..d2d173ba6a 100644
--- a/tests/utils/test_log_handlers.py
+++ b/tests/utils/test_log_handlers.py
@@ -421,16 +421,14 @@ class TestFileTaskLogHandler:
assert actual_kwargs["namespace"] == namespace_to_call
actual_selector = actual_kwargs["label_selector"]
assert re.match(
- ",".join(
- [
- "airflow_version=.+?",
- "dag_id=dag_for_testing_file_task_handler",
- "kubernetes_executor=True",
- "run_id=manual__2016-01-01T0000000000-2b88d1d57",
- "task_id=task_for_testing_file_log_handler",
- "try_number=2",
- "airflow-worker",
- ]
+ (
+ "airflow_version=.+?,"
+ "dag_id=dag_for_testing_file_task_handler,"
+ "kubernetes_executor=True,"
+ "run_id=manual__2016-01-01T0000000000-2b88d1d57,"
+ "task_id=task_for_testing_file_log_handler,"
+ "try_number=2,"
+ "airflow-worker"
),
actual_selector,
)
