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 fe59f4ae21 Remove unused fixtures in slack tests (#31268)
fe59f4ae21 is described below
commit fe59f4ae211d35ba5e85882b457dd26d22e84c62
Author: Jed Cunningham <[email protected]>
AuthorDate: Sat May 13 08:24:20 2023 -0500
Remove unused fixtures in slack tests (#31268)
---
tests/providers/slack/notifications/test_slack.py | 31 ++++-------------------
tests/providers/slack/operators/test_slack.py | 17 -------------
2 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/tests/providers/slack/notifications/test_slack.py
b/tests/providers/slack/notifications/test_slack.py
index 04f75698a3..f8c22fe0d3 100644
--- a/tests/providers/slack/notifications/test_slack.py
+++ b/tests/providers/slack/notifications/test_slack.py
@@ -19,38 +19,16 @@ from __future__ import annotations
from unittest import mock
-import pytest
-
-from airflow.models import Connection
from airflow.operators.empty import EmptyOperator
-from airflow.providers.slack.hooks.slack import SlackHook
from airflow.providers.slack.notifications.slack import SlackNotifier,
send_slack_notification
-SLACK_API_DEFAULT_CONN_ID = SlackHook.default_conn_name
-
-
[email protected](scope="module", autouse=True)
-def slack_api_connections():
- """Create tests connections."""
- connections = [
- Connection(
- conn_id=SLACK_API_DEFAULT_CONN_ID,
- conn_type="slack",
-
password="xoxb-1234567890123-09876543210987-AbCdEfGhIjKlMnOpQrStUvWx",
- ),
- ]
-
- conn_uris = {f"AIRFLOW_CONN_{c.conn_id.upper()}": c.get_uri() for c in
connections}
-
- with mock.patch.dict("os.environ", values=conn_uris):
- yield
-
class TestSlackNotifier:
@mock.patch("airflow.providers.slack.notifications.slack.SlackHook")
- def test_slack_notifier(self, mock_slack_hook, slack_api_connections,
dag_maker):
+ def test_slack_notifier(self, mock_slack_hook, dag_maker):
with dag_maker("test_slack_notifier") as dag:
EmptyOperator(task_id="task1")
+
notifier = send_slack_notification(text="test")
notifier(context={"dag": dag})
mock_slack_hook.return_value.call.assert_called_once_with(
@@ -67,9 +45,10 @@ class TestSlackNotifier:
)
@mock.patch("airflow.providers.slack.notifications.slack.SlackHook")
- def test_slack_notifier_with_notifier_class(self, mock_slack_hook,
slack_api_connections, dag_maker):
+ def test_slack_notifier_with_notifier_class(self, mock_slack_hook,
dag_maker):
with dag_maker("test_slack_notifier") as dag:
EmptyOperator(task_id="task1")
+
notifier = SlackNotifier(text="test")
notifier(context={"dag": dag})
mock_slack_hook.return_value.call.assert_called_once_with(
@@ -86,7 +65,7 @@ class TestSlackNotifier:
)
@mock.patch("airflow.providers.slack.notifications.slack.SlackHook")
- def test_slack_notifier_templated(self, mock_slack_hook,
slack_api_connections, dag_maker):
+ def test_slack_notifier_templated(self, mock_slack_hook, dag_maker):
with dag_maker("test_slack_notifier") as dag:
EmptyOperator(task_id="task1")
diff --git a/tests/providers/slack/operators/test_slack.py
b/tests/providers/slack/operators/test_slack.py
index f825819b54..3e34386247 100644
--- a/tests/providers/slack/operators/test_slack.py
+++ b/tests/providers/slack/operators/test_slack.py
@@ -24,7 +24,6 @@ from unittest.mock import MagicMock
import pytest
from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.models import Connection
from airflow.providers.slack.operators.slack import (
SlackAPIFileOperator,
SlackAPIOperator,
@@ -34,22 +33,6 @@ from airflow.providers.slack.operators.slack import (
SLACK_API_TEST_CONNECTION_ID = "test_slack_conn_id"
[email protected](scope="module", autouse=True)
-def slack_api_connections():
- """Create tests connections."""
- connections = [
- Connection(
- conn_id=SLACK_API_TEST_CONNECTION_ID,
- conn_type="slack",
-
password="xoxb-1234567890123-09876543210987-AbCdEfGhIjKlMnOpQrStUvWx",
- ),
- ]
- conn_uris = {f"AIRFLOW_CONN_{c.conn_id.upper()}": c.get_uri() for c in
connections}
-
- with mock.patch.dict("os.environ", values=conn_uris):
- yield
-
-
class TestSlackAPIOperator:
@mock.patch("airflow.providers.slack.operators.slack.mask_secret")
def test_mask_token(self, mock_mask_secret):
