This is an automated email from the ASF dual-hosted git repository.
taragolis 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 f04dbec69e Resolve sftp deprecations in tests (#39930)
f04dbec69e is described below
commit f04dbec69ecbe2acb160259629a2670d45f2f234
Author: Gopal Dirisala <[email protected]>
AuthorDate: Thu May 30 15:07:40 2024 +0530
Resolve sftp deprecations in tests (#39930)
---
tests/deprecations_ignore.yml | 9 ------
tests/providers/sftp/operators/test_sftp.py | 44 ++++++++++++++++++++---------
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/tests/deprecations_ignore.yml b/tests/deprecations_ignore.yml
index 73e407211a..7e3439ecac 100644
--- a/tests/deprecations_ignore.yml
+++ b/tests/deprecations_ignore.yml
@@ -649,15 +649,6 @@
-
tests/providers/postgres/operators/test_postgres.py::TestPostgres::test_vacuum
-
tests/providers/postgres/operators/test_postgres.py::TestPostgresOpenLineage::test_postgres_operator_openlineage_explicit_schema
-
tests/providers/postgres/operators/test_postgres.py::TestPostgresOpenLineage::test_postgres_operator_openlineage_implicit_schema
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_arg_checking
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_file_transfer_no_intermediate_dir_error_get
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_file_transfer_no_intermediate_dir_error_put
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_file_transfer_with_intermediate_dir_error_get
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_file_transfer_with_intermediate_dir_put
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_json_file_transfer_get
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_json_file_transfer_put
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_pickle_file_transfer_get
--
tests/providers/sftp/operators/test_sftp.py::TestSFTPOperator::test_pickle_file_transfer_put
-
tests/providers/snowflake/operators/test_snowflake.py::TestSnowflakeOperator::test_snowflake_operator
-
tests/providers/snowflake/operators/test_snowflake.py::TestSnowflakeOperatorForParams::test_overwrite_params
- tests/providers/snowflake/operators/test_snowflake_sql.py::test_exec_success
diff --git a/tests/providers/sftp/operators/test_sftp.py
b/tests/providers/sftp/operators/test_sftp.py
index 984c5e925b..ca562515f2 100644
--- a/tests/providers/sftp/operators/test_sftp.py
+++ b/tests/providers/sftp/operators/test_sftp.py
@@ -27,7 +27,7 @@ import paramiko
import pytest
from openlineage.client.run import Dataset
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.models import DAG, Connection
from airflow.providers.sftp.hooks.sftp import SFTPHook
from airflow.providers.sftp.operators.sftp import SFTPOperation, SFTPOperator
@@ -121,8 +121,9 @@ class TestSFTPOperator:
)
tis = {ti.task_id: ti for ti in
dag_maker.create_dagrun().task_instances}
- tis["put_test_task"].run()
- tis["check_file_task"].run()
+ with pytest.warns(AirflowProviderDeprecationWarning, match="Parameter
`ssh_hook` is deprecated..*"):
+ tis["put_test_task"].run()
+ tis["check_file_task"].run()
pulled = tis["check_file_task"].xcom_pull(task_ids="check_file_task",
key="return_value")
assert pulled.strip() == test_local_file_content
@@ -150,7 +151,9 @@ class TestSFTPOperator:
operation=SFTPOperation.PUT,
create_intermediate_dirs=False,
)
- with pytest.raises(AirflowException) as ctx:
+ with pytest.raises(AirflowException) as ctx, pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook` is
deprecated..*"
+ ):
ti2.run()
assert "No such file" in str(ctx.value)
@@ -182,8 +185,9 @@ class TestSFTPOperator:
dagrun = dag_maker.create_dagrun(execution_date=timezone.utcnow())
tis = {ti.task_id: ti for ti in dagrun.task_instances}
- tis["test_sftp"].run()
- tis["test_check_file"].run()
+ with pytest.warns(AirflowProviderDeprecationWarning, match="Parameter
`ssh_hook` is deprecated..*"):
+ tis["test_sftp"].run()
+ tis["test_check_file"].run()
pulled = tis["test_check_file"].xcom_pull(task_ids="test_check_file",
key="return_value")
assert pulled.strip() == test_local_file_content
@@ -215,8 +219,9 @@ class TestSFTPOperator:
dagrun = dag_maker.create_dagrun(execution_date=timezone.utcnow())
tis = {ti.task_id: ti for ti in dagrun.task_instances}
- tis["put_test_task"].run()
- tis["check_file_task"].run()
+ with pytest.warns(AirflowProviderDeprecationWarning, match="Parameter
`ssh_hook` is deprecated..*"):
+ tis["put_test_task"].run()
+ tis["check_file_task"].run()
pulled = tis["check_file_task"].xcom_pull(task_ids="check_file_task",
key="return_value")
assert pulled.strip() ==
b64encode(test_local_file_content).decode("utf-8")
@@ -240,7 +245,10 @@ class TestSFTPOperator:
)
for ti in
dag_maker.create_dagrun(execution_date=timezone.utcnow()).task_instances:
- ti.run()
+ with pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook`
is deprecated..*"
+ ):
+ ti.run()
# Test the received content.
with open(self.test_local_filepath, "rb") as file:
@@ -259,7 +267,10 @@ class TestSFTPOperator:
)
for ti in
dag_maker.create_dagrun(execution_date=timezone.utcnow()).task_instances:
- ti.run()
+ with pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook`
is deprecated..*"
+ ):
+ ti.run()
# Test the received content.
content_received = None
@@ -281,7 +292,9 @@ class TestSFTPOperator:
for ti in
dag_maker.create_dagrun(execution_date=timezone.utcnow()).task_instances:
# This should raise an error with "No such file" as the directory
# does not exist.
- with pytest.raises(AirflowException) as ctx:
+ with pytest.raises(AirflowException) as ctx, pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook`
is deprecated..*"
+ ):
ti.run()
assert "No such file" in str(ctx.value)
@@ -298,7 +311,10 @@ class TestSFTPOperator:
)
for ti in
dag_maker.create_dagrun(execution_date=timezone.utcnow()).task_instances:
- ti.run()
+ with pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook`
is deprecated..*"
+ ):
+ ti.run()
# Test the received content.
content_received = None
@@ -356,7 +372,9 @@ class TestSFTPOperator:
operation=SFTPOperation.PUT,
dag=dag,
)
- with contextlib.suppress(Exception):
+ with contextlib.suppress(Exception), pytest.warns(
+ AirflowProviderDeprecationWarning, match="Parameter `ssh_hook` is
deprecated..*"
+ ):
task_3.execute(None)
assert task_3.sftp_hook.ssh_conn_id == self.hook.ssh_conn_id
