Lee-W commented on code in PR #47270:
URL: https://github.com/apache/airflow/pull/47270#discussion_r1997822820
##########
tests/api_fastapi/core_api/routes/public/test_import_error.py:
##########
@@ -48,46 +50,82 @@ class TestImportErrorEndpoint:
@staticmethod
def _clear_db():
clear_db_import_errors()
+ clear_db_dags()
+
+ @staticmethod
+ def set_mock_auth_manager__is_authorized_dag(
+ mock_auth_manager: mock.Mock, is_authorized_dag_return_value: bool =
False
+ ) -> mock.Mock:
+ mock_is_authorized_dag =
mock_auth_manager.return_value.is_authorized_dag
+ mock_is_authorized_dag.return_value = is_authorized_dag_return_value
+ return mock_is_authorized_dag
+
+ @staticmethod
+ def set_mock_auth_manager__get_authorized_dag_ids(
+ mock_auth_manager: mock.Mock, get_authorized_dag_ids_return_value:
set[str] | None = None
+ ) -> mock.Mock:
+ if get_authorized_dag_ids_return_value is None:
+ get_authorized_dag_ids_return_value = set()
+ mock_get_authorized_dag_ids =
mock_auth_manager.return_value.get_authorized_dag_ids
+ mock_get_authorized_dag_ids.return_value =
get_authorized_dag_ids_return_value
+ return mock_get_authorized_dag_ids
+
+ @staticmethod
+ def set_mock_auth_manager__batch_is_authorized_dag(
+ mock_auth_manager: mock.Mock, batch_is_authorized_dag_return_value:
bool = False
+ ) -> mock.Mock:
+ mock_batch_is_authorized_dag =
mock_auth_manager.return_value.batch_is_authorized_dag
+ mock_batch_is_authorized_dag.return_value =
batch_is_authorized_dag_return_value
+ return mock_batch_is_authorized_dag
+
+ @provide_session
+ def prepare_dag_model(self, session=None):
+ """
+ Prepare DAG model for tests.
+ """
+ dag_model = DagModel(fileloc=FILENAME1, dag_id="dag_id1",
is_paused=False)
+ not_permitted_dag_model = DagModel(fileloc=FILENAME1,
dag_id="dag_id4", is_paused=False)
+ session.add_all([dag_model, not_permitted_dag_model])
+ self.dag_id = str(dag_model.dag_id)
+ self.not_permitted_dag_id = str(not_permitted_dag_model.dag_id)
@pytest.fixture(autouse=True)
@provide_session
- def setup(self, session=None) -> dict[str, ParseImportError]:
+ def setup(self, session=None):
Review Comment:
```suggestion
def setup(self, session: Session|None=None) -> None:
```
##########
tests/api_fastapi/core_api/routes/public/test_import_error.py:
##########
@@ -48,46 +50,82 @@ class TestImportErrorEndpoint:
@staticmethod
def _clear_db():
clear_db_import_errors()
+ clear_db_dags()
+
+ @staticmethod
+ def set_mock_auth_manager__is_authorized_dag(
+ mock_auth_manager: mock.Mock, is_authorized_dag_return_value: bool =
False
+ ) -> mock.Mock:
+ mock_is_authorized_dag =
mock_auth_manager.return_value.is_authorized_dag
+ mock_is_authorized_dag.return_value = is_authorized_dag_return_value
+ return mock_is_authorized_dag
+
+ @staticmethod
+ def set_mock_auth_manager__get_authorized_dag_ids(
+ mock_auth_manager: mock.Mock, get_authorized_dag_ids_return_value:
set[str] | None = None
+ ) -> mock.Mock:
+ if get_authorized_dag_ids_return_value is None:
+ get_authorized_dag_ids_return_value = set()
+ mock_get_authorized_dag_ids =
mock_auth_manager.return_value.get_authorized_dag_ids
+ mock_get_authorized_dag_ids.return_value =
get_authorized_dag_ids_return_value
+ return mock_get_authorized_dag_ids
+
+ @staticmethod
+ def set_mock_auth_manager__batch_is_authorized_dag(
+ mock_auth_manager: mock.Mock, batch_is_authorized_dag_return_value:
bool = False
+ ) -> mock.Mock:
+ mock_batch_is_authorized_dag =
mock_auth_manager.return_value.batch_is_authorized_dag
+ mock_batch_is_authorized_dag.return_value =
batch_is_authorized_dag_return_value
+ return mock_batch_is_authorized_dag
+
+ @provide_session
+ def prepare_dag_model(self, session=None):
Review Comment:
```suggestion
def prepare_dag_model(self, session: Session=None) -> None:
```
##########
tests/api_fastapi/core_api/routes/public/test_import_error.py:
##########
@@ -48,6 +50,15 @@ class TestImportErrorEndpoint:
@staticmethod
def _clear_db():
clear_db_import_errors()
+ clear_db_dags()
+
+ @provide_session
Review Comment:
I actually like session fixture more, but we could keep it as it is till the
next time we want to bring this topic up
##########
tests/api_fastapi/core_api/routes/public/test_import_error.py:
##########
@@ -48,46 +50,82 @@ class TestImportErrorEndpoint:
@staticmethod
def _clear_db():
clear_db_import_errors()
+ clear_db_dags()
+
+ @staticmethod
+ def set_mock_auth_manager__is_authorized_dag(
+ mock_auth_manager: mock.Mock, is_authorized_dag_return_value: bool =
False
+ ) -> mock.Mock:
+ mock_is_authorized_dag =
mock_auth_manager.return_value.is_authorized_dag
+ mock_is_authorized_dag.return_value = is_authorized_dag_return_value
+ return mock_is_authorized_dag
+
+ @staticmethod
+ def set_mock_auth_manager__get_authorized_dag_ids(
+ mock_auth_manager: mock.Mock, get_authorized_dag_ids_return_value:
set[str] | None = None
+ ) -> mock.Mock:
+ if get_authorized_dag_ids_return_value is None:
+ get_authorized_dag_ids_return_value = set()
+ mock_get_authorized_dag_ids =
mock_auth_manager.return_value.get_authorized_dag_ids
+ mock_get_authorized_dag_ids.return_value =
get_authorized_dag_ids_return_value
+ return mock_get_authorized_dag_ids
+
+ @staticmethod
+ def set_mock_auth_manager__batch_is_authorized_dag(
+ mock_auth_manager: mock.Mock, batch_is_authorized_dag_return_value:
bool = False
+ ) -> mock.Mock:
+ mock_batch_is_authorized_dag =
mock_auth_manager.return_value.batch_is_authorized_dag
+ mock_batch_is_authorized_dag.return_value =
batch_is_authorized_dag_return_value
+ return mock_batch_is_authorized_dag
Review Comment:
we probably should make these static method fixtures
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
