Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e76d785
refactor: Moved helper functions which allows you to run deferrable o…
davidblain-infrabel Jan 8, 2025
36f7df6
refactor: Reformatted xcom_pull method from mock_context
davidblain-infrabel Jan 8, 2025
3ac3906
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 8, 2025
9a17ee6
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 8, 2025
d2ae270
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 9, 2025
5fca06f
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 9, 2025
11129ff
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 9, 2025
50cf44d
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 10, 2025
814eb61
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 10, 2025
c773b38
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 11, 2025
c6df575
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 13, 2025
4767f0b
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 13, 2025
f0e5119
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 14, 2025
74cb99b
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 15, 2025
82e007e
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 15, 2025
83933c0
refactor: Removed unused imports from conftest
davidblain-infrabel Jan 15, 2025
20fd3d2
refactor: Removed unused import from conftest
davidblain-infrabel Jan 15, 2025
757eada
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 15, 2025
f2d3f3c
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 15, 2025
ab05793
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 17, 2025
e6847cc
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 17, 2025
53f75fe
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 17, 2025
dc72663
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 17, 2025
2afcc89
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 18, 2025
c7af320
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 19, 2025
3a79fed
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 19, 2025
2894c2d
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 20, 2025
89bedf1
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 20, 2025
6992cc4
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 22, 2025
813dcfc
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 22, 2025
16a051f
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 22, 2025
45b84dd
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 22, 2025
4c4bbf4
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 23, 2025
ff0ac22
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 23, 2025
7bf4d2e
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 24, 2025
54de33e
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 24, 2025
f197305
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 24, 2025
6e5081b
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 24, 2025
9b98471
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 26, 2025
ccabac6
Merge branch 'main' into feature/move-test-functions-from-azure-to-te…
dabla Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 1 addition & 48 deletions providers/tests/microsoft/azure/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,14 @@
# under the License.
from __future__ import annotations

import asyncio
from contextlib import contextmanager
from copy import deepcopy
from typing import TYPE_CHECKING, Any
from unittest.mock import patch

from kiota_http.httpx_request_adapter import HttpxRequestAdapter

from airflow.exceptions import TaskDeferred
from airflow.providers.microsoft.azure.hooks.msgraph import KiotaRequestAdapterHook

from providers.tests.microsoft.conftest import get_airflow_connection, mock_context

if TYPE_CHECKING:
from airflow.models import Operator
from airflow.triggers.base import BaseTrigger, TriggerEvent
from providers.tests.microsoft.conftest import get_airflow_connection


class Base:
Expand All @@ -49,42 +41,3 @@ def patch_hook_and_request_adapter(self, response):
else:
mock_get_http_response.return_value = response
yield

@staticmethod
async def _run_tigger(trigger: BaseTrigger) -> list[TriggerEvent]:
events = []
async for event in trigger.run():
events.append(event)
return events

def run_trigger(self, trigger: BaseTrigger) -> list[TriggerEvent]:
return asyncio.run(self._run_tigger(trigger))

def execute_operator(self, operator: Operator) -> tuple[Any, Any]:
context = mock_context(task=operator)
return asyncio.run(self.deferrable_operator(context, operator))

async def deferrable_operator(self, context, operator):
result = None
triggered_events = []
try:
operator.render_template_fields(context=context)
result = operator.execute(context=context)
except TaskDeferred as deferred:
task = deferred

while task:
events = await self._run_tigger(task.trigger)

if not events:
break

triggered_events.extend(deepcopy(events))

try:
method = getattr(operator, task.method_name)
result = method(context=context, event=next(iter(events)).payload)
task = None
except TaskDeferred as exception:
task = exception
return result, triggered_events
15 changes: 8 additions & 7 deletions providers/tests/microsoft/azure/operators/test_msgraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
from providers.tests.microsoft.conftest import (
load_file,
load_json,
mock_context,
mock_json_response,
mock_response,
)
from tests_common.test_utils.mock_context import mock_context
from tests_common.test_utils.operators.run_deferrable import execute_operator
from tests_common.test_utils.version_compat import AIRFLOW_V_2_10_PLUS

if TYPE_CHECKING:
Expand All @@ -60,7 +61,7 @@ def test_execute(self):
result_processor=lambda context, result: result.get("value"),
)

results, events = self.execute_operator(operator)
results, events = execute_operator(operator)

assert len(results) == 30
assert results == users.get("value") + next_users.get("value")
Expand Down Expand Up @@ -88,7 +89,7 @@ def test_execute_when_do_xcom_push_is_false(self):
do_xcom_push=False,
)

results, events = self.execute_operator(operator)
results, events = execute_operator(operator)

assert isinstance(results, dict)
assert len(events) == 1
Expand All @@ -108,7 +109,7 @@ def test_execute_when_an_exception_occurs(self):
)

with pytest.raises(AirflowException):
self.execute_operator(operator)
execute_operator(operator)

@pytest.mark.db_test
def test_execute_when_an_exception_occurs_on_custom_event_handler(self):
Expand All @@ -128,7 +129,7 @@ def custom_event_handler(context: Context, event: dict[Any, Any] | None = None):
event_handler=custom_event_handler,
)

results, events = self.execute_operator(operator)
results, events = execute_operator(operator)

assert not results
assert len(events) == 1
Expand All @@ -152,7 +153,7 @@ def test_execute_when_response_is_bytes(self):
path_parameters={"drive_id": drive_id},
)

results, events = self.execute_operator(operator)
results, events = execute_operator(operator)

assert operator.path_parameters == {"drive_id": drive_id}
assert results == base64_encoded_content
Expand All @@ -179,7 +180,7 @@ def test_execute_with_lambda_parameter_when_response_is_bytes(self):
path_parameters=lambda context, jinja_env: {"drive_id": drive_id},
)

results, events = self.execute_operator(operator)
results, events = execute_operator(operator)

assert operator.path_parameters == {"drive_id": drive_id}
assert results == base64_encoded_content
Expand Down
3 changes: 2 additions & 1 deletion providers/tests/microsoft/azure/operators/test_powerbi.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
from airflow.utils import timezone

from providers.tests.microsoft.azure.base import Base
from providers.tests.microsoft.conftest import get_airflow_connection, mock_context
from providers.tests.microsoft.conftest import get_airflow_connection
from tests_common.test_utils.mock_context import mock_context

DEFAULT_CONNECTION_CLIENT_SECRET = "powerbi_conn_id"
TASK_ID = "run_powerbi_operator"
Expand Down
5 changes: 3 additions & 2 deletions providers/tests/microsoft/azure/sensors/test_msgraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

from providers.tests.microsoft.azure.base import Base
from providers.tests.microsoft.conftest import load_json, mock_json_response
from tests_common.test_utils.operators.run_deferrable import execute_operator
from tests_common.test_utils.version_compat import AIRFLOW_V_2_10_PLUS


Expand All @@ -45,7 +46,7 @@ def test_execute(self):
timeout=350.0,
)

results, events = self.execute_operator(sensor)
results, events = execute_operator(sensor)

assert sensor.path_parameters == {"scanId": "0a1b1bf3-37de-48f7-9863-ed4cda97a9ef"}
assert isinstance(results, str)
Expand Down Expand Up @@ -78,7 +79,7 @@ def test_execute_with_lambda_parameter(self):
timeout=350.0,
)

results, events = self.execute_operator(sensor)
results, events = execute_operator(sensor)

assert sensor.path_parameters == {"scanId": "0a1b1bf3-37de-48f7-9863-ed4cda97a9ef"}
assert isinstance(results, str)
Expand Down
9 changes: 5 additions & 4 deletions providers/tests/microsoft/azure/triggers/test_msgraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
mock_json_response,
mock_response,
)
from tests_common.test_utils.operators.run_deferrable import run_trigger


class TestMSGraphTrigger(Base):
Expand All @@ -51,7 +52,7 @@ def test_run_when_valid_response(self):

with self.patch_hook_and_request_adapter(response):
trigger = MSGraphTrigger("users/delta", conn_id="msgraph_api")
actual = self.run_trigger(trigger)
actual = run_trigger(trigger)

assert len(actual) == 1
assert isinstance(actual[0], TriggerEvent)
Expand All @@ -64,7 +65,7 @@ def test_run_when_response_is_none(self):

with self.patch_hook_and_request_adapter(response):
trigger = MSGraphTrigger("users/delta", conn_id="msgraph_api")
actual = self.run_trigger(trigger)
actual = run_trigger(trigger)

assert len(actual) == 1
assert isinstance(actual[0], TriggerEvent)
Expand All @@ -75,7 +76,7 @@ def test_run_when_response_is_none(self):
def test_run_when_response_cannot_be_converted_to_json(self):
with self.patch_hook_and_request_adapter(AirflowException()):
trigger = MSGraphTrigger("users/delta", conn_id="msgraph_api")
actual = next(iter(self.run_trigger(trigger)))
actual = next(iter(run_trigger(trigger)))

assert isinstance(actual, TriggerEvent)
assert actual.payload["status"] == "failure"
Expand All @@ -91,7 +92,7 @@ def test_run_when_response_is_bytes(self):
"https://graph.microsoft.com/v1.0/me/drive/items/1b30fecf-4330-4899-b249-104c2afaf9ed/content"
)
trigger = MSGraphTrigger(url, response_type="bytes", conn_id="msgraph_api")
actual = next(iter(self.run_trigger(trigger)))
actual = next(iter(run_trigger(trigger)))

assert isinstance(actual, TriggerEvent)
assert actual.payload["status"] == "success"
Expand Down
58 changes: 1 addition & 57 deletions providers/tests/microsoft/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
import random
import re
import string
from collections.abc import Iterable
from inspect import currentframe
from json import JSONDecodeError
from os.path import dirname, join
from typing import TYPE_CHECKING, Any, TypeVar
from typing import Any, TypeVar
from unittest.mock import MagicMock

import pytest
Expand All @@ -35,15 +34,6 @@
from airflow.models import Connection
from airflow.providers.microsoft.azure.hooks.powerbi import PowerBIHook

try:
from airflow.sdk.definitions.context import Context
except ImportError:
# TODO: Remove once provider drops support for Airflow 2
from airflow.utils.context import Context

if TYPE_CHECKING:
from sqlalchemy.orm import Session

T = TypeVar("T", dict, str, Connection)


Expand Down Expand Up @@ -117,52 +107,6 @@ def mock_response(status_code, content: Any = None, headers: dict | None = None)
return response


def mock_context(task) -> Context:
from airflow.models import TaskInstance
from airflow.utils.session import NEW_SESSION
from airflow.utils.state import TaskInstanceState
from airflow.utils.xcom import XCOM_RETURN_KEY

values: dict[str, Any] = {}

class MockedTaskInstance(TaskInstance):
def __init__(
self,
task,
run_id: str | None = "run_id",
state: str | None = TaskInstanceState.RUNNING,
map_index: int = -1,
):
super().__init__(task=task, run_id=run_id, state=state, map_index=map_index)
self.values: dict[str, Any] = {}

def xcom_pull(
self,
task_ids: str | Iterable[str] | None = None,
dag_id: str | None = None,
key: str = XCOM_RETURN_KEY,
include_prior_dates: bool = False,
session: Session = NEW_SESSION,
*,
map_indexes: int | Iterable[int] | None = None,
default: Any = None,
run_id: str | None = None,
) -> Any:
if map_indexes:
return values.get(
f"{task_ids or self.task_id}_{dag_id or self.dag_id}_{key}_{map_indexes}", default
)
return values.get(f"{task_ids or self.task_id}_{dag_id or self.dag_id}_{key}", default)

def xcom_push(self, key: str, value: Any, session: Session = NEW_SESSION, **kwargs) -> None:
values[f"{self.task_id}_{self.dag_id}_{key}_{self.map_index}"] = value

values["ti"] = MockedTaskInstance(task=task)

# See https://github.com/python/mypy/issues/8890 - mypy does not support passing typed dict to TypedDict
return Context(values) # type: ignore[misc]


def remove_license_header(content: str) -> str:
"""
Removes license header from the given content.
Expand Down
71 changes: 71 additions & 0 deletions tests_common/test_utils/mock_context.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from __future__ import annotations

from collections.abc import Iterable
from typing import TYPE_CHECKING, Any

from airflow.utils.context import Context

if TYPE_CHECKING:
from sqlalchemy.orm import Session


def mock_context(task) -> Context:
from airflow.models import TaskInstance
from airflow.utils.session import NEW_SESSION
from airflow.utils.state import TaskInstanceState
from airflow.utils.xcom import XCOM_RETURN_KEY

values: dict[str, Any] = {}

class MockedTaskInstance(TaskInstance):
def __init__(
self,
task,
run_id: str | None = "run_id",
state: str | None = TaskInstanceState.RUNNING,
map_index: int = -1,
):
super().__init__(task=task, run_id=run_id, state=state, map_index=map_index)
self.values: dict[str, Any] = {}

def xcom_pull(
self,
task_ids: str | Iterable[str] | None = None,
dag_id: str | None = None,
key: str = XCOM_RETURN_KEY,
include_prior_dates: bool = False,
session: Session = NEW_SESSION,
*,
map_indexes: int | Iterable[int] | None = None,
default: Any = None,
run_id: str | None = None,
) -> Any:
if map_indexes:
return values.get(
f"{task_ids or self.task_id}_{dag_id or self.dag_id}_{key}_{map_indexes}", default
)
return values.get(f"{task_ids or self.task_id}_{dag_id or self.dag_id}_{key}", default)

def xcom_push(self, key: str, value: Any, session: Session = NEW_SESSION, **kwargs) -> None:
values[f"{self.task_id}_{self.dag_id}_{key}_{self.map_index}"] = value

values["ti"] = MockedTaskInstance(task=task)

# See https://github.com/python/mypy/issues/8890 - mypy does not support passing typed dict to TypedDict
return Context(values) # type: ignore[misc]
Loading