From 6a85920f91f94b867d810fa7b578e06ce811cb6e Mon Sep 17 00:00:00 2001 From: bugraoz93 Date: Mon, 6 Apr 2026 21:21:06 +0200 Subject: [PATCH 1/2] Add missing custom commands and simplify calls in airflowctl integration tests --- .../test_airflowctl_commands.py | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py b/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py index 4aea60dca681e..f89796eced17a 100644 --- a/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py +++ b/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py @@ -51,6 +51,7 @@ def date_param(): TEST_COMMANDS = [ # Auth commands f"auth token {CREDENTIAL_SUFFIX}", + "auth list-envs", # Assets commands "assets list", "assets get --asset-id=1", @@ -168,9 +169,7 @@ def test_hardcoded_xcom_key_would_collide(): ) def test_airflowctl_commands(command: str, run_command): """Test airflowctl commands using docker-compose environment.""" - env_vars = {"AIRFLOW_CLI_DEBUG_MODE": "true"} - - run_command(command, env_vars, skip_login=True) + run_command(command=command, env_vars={"AIRFLOW_CLI_DEBUG_MODE": "true"}, skip_login=True) @pytest.mark.parametrize( @@ -180,9 +179,17 @@ def test_airflowctl_commands(command: str, run_command): ) def test_airflowctl_commands_skip_keyring(command: str, api_token: str, run_command): """Test airflowctl commands using docker-compose environment without using keyring.""" - env_vars = {} - env_vars["AIRFLOW_CLI_TOKEN"] = api_token - env_vars["AIRFLOW_CLI_DEBUG_MODE"] = "false" - env_vars["AIRFLOW_CLI_ENVIRONMENT"] = "nokeyring" - - run_command(command, env_vars, skip_login=True) + run_command( + command=command, + env_vars={ + "AIRFLOW_CLI_TOKEN": api_token, + "AIRFLOW_CLI_DEBUG_MODE": "false", + "AIRFLOW_CLI_ENVIRONMENT": "nokeyring", + }, + skip_login=True, + ) + + +def test_airflowctl_auth_login_with_username_and_pass_word(run_command): + """Test airflowctl auth login with username and password.""" + run_command(command=f"auth login login-with-username-and-password {CREDENTIAL_SUFFIX}", skip_login=True) From d86dfa36b1523779d5576b922a0ba23d075e3af1 Mon Sep 17 00:00:00 2001 From: bugraoz93 Date: Tue, 7 Apr 2026 20:17:16 +0200 Subject: [PATCH 2/2] Remove operation test as command not materialised --- .../tests/airflowctl_tests/test_airflowctl_commands.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py b/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py index f89796eced17a..c004f5ccfdb2f 100644 --- a/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py +++ b/airflow-ctl-tests/tests/airflowctl_tests/test_airflowctl_commands.py @@ -188,8 +188,3 @@ def test_airflowctl_commands_skip_keyring(command: str, api_token: str, run_comm }, skip_login=True, ) - - -def test_airflowctl_auth_login_with_username_and_pass_word(run_command): - """Test airflowctl auth login with username and password.""" - run_command(command=f"auth login login-with-username-and-password {CREDENTIAL_SUFFIX}", skip_login=True)