Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test: replace session specs with real sessions (#43190)

Asuka Minato46f32a7d2287
diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
index 5a378cd1fe2..80281462b49 100644
--- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
+++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
@@ -1176,6 +1176,7 @@ def test_agent_version_queries_do_not_require_paid_plan(app: Flask, monkeypatch:
)
def test_agent_version_restore_requires_cloud_paid_plan(
monkeypatch: pytest.MonkeyPatch,
+ sqlite_session: Session,
edition: DeploymentEdition,
plan: CloudPlan,
allowed: bool,
@@ -1187,7 +1188,7 @@ def test_agent_version_restore_requires_cloud_paid_plan(
monkeypatch.setattr(roster_controller.FeatureService, "get_workspace_plan", get_plan)
restore = Mock(return_value={"result": "success", "active_config_snapshot_id": version_id})
monkeypatch.setattr(roster_controller.AgentRosterService, "restore_agent_version", restore)
- session = MagicMock(spec=Session)
+ session = sqlite_session
api = AgentRosterVersionRestoreApi()
if not allowed:
@@ -1195,7 +1196,7 @@ def test_agent_version_restore_requires_cloud_paid_plan(
unwrap(api.post)(api, session, "tenant-1", _account(), agent_id, version_id)
assert exc_info.value.code == 403
restore.assert_not_called()
- assert session.mock_calls == []
+ assert not session.in_transaction()
else:
restored = unwrap(api.post)(api, session, "tenant-1", _account(), agent_id, version_id)
assert restored == {
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
index 8425c9560de..1dfd995db93 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
@@ -321,12 +321,12 @@ def _captured_where_clauses(
method = unwrap(api.get)
account = _make_account()
- with app.test_request_context("/", method="GET"):
+ with Session() as session, app.test_request_context("/", method="GET"):
with patch.object(sa.sql.selectable.Select, "where", spy_where):
method(
api,
query_instance,
- MagicMock(spec=Session),
+ session,
account,
app_model=_app(mode=app_mode),
)
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow_apis.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow_apis.py
index 9226d33433b..b9597f3c171 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow_apis.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow_apis.py
@@ -697,7 +697,8 @@ class TestRagPipelineByIdApi:
@contextmanager
def transaction() -> Generator[Session]:
events.append("transaction-enter")
- yield MagicMock(spec=Session)
+ with Session() as session:
+ yield session
events.append("transaction-exit")
if transaction_fails:
raise error
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index 0606ccd23c8..9dab2c7a157 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import logging
from datetime import UTC, datetime
from decimal import Decimal
-from unittest.mock import Mock, patch
+from unittest.mock import patch
import pytest
from sqlalchemy.orm import Session, sessionmaker
@@ -294,6 +294,7 @@ def test_get_pause_record_loads_reasons_and_tokens_in_one_repository_call(
def test_delete_pause_model_deletes_record_when_state_object_delete_fails(
caplog: pytest.LogCaptureFixture,
+ sqlite_session: Session,
) -> None:
pause_model = WorkflowPause(
workflow_id="workflow-1",
@@ -301,7 +302,9 @@ def test_delete_pause_model_deletes_record_when_state_object_delete_fails(
state_object_key="workflow-state.json",
)
pause_model.id = "pause-1"
- session = Mock(spec=Session)
+ session = sqlite_session
+ session.add(pause_model)
+ session.commit()
with (
patch(
@@ -313,7 +316,8 @@ def test_delete_pause_model_deletes_record_when_state_object_delete_fails(
DifyAPISQLAlchemyWorkflowRunRepository._delete_pause_model(session, pause_model)
delete_state_object.assert_called_once_with(pause_model.state_object_key)
- session.delete.assert_called_once_with(pause_model)
+ session.commit()
+ assert session.get(WorkflowPause, "pause-1") is None
assert "pause_id=pause-1" in caplog.text
assert "workflow_run_id=run-1" in caplog.text
assert "object_key=workflow-state.json" in caplog.text
diff --git a/api/tests/unit_tests/repositories/test_trial_app_repository.py b/api/tests/unit_tests/repositories/test_trial_app_repository.py
index fd8d926ac42..e311516b79b 100644
--- a/api/tests/unit_tests/repositories/test_trial_app_repository.py
+++ b/api/tests/unit_tests/repositories/test_trial_app_repository.py
@@ -1,7 +1,7 @@
import uuid
-from unittest.mock import MagicMock
import pytest
+from pytest_mock import MockerFixture
from sqlalchemy import Engine, select
from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy.pool import QueuePool
@@ -54,13 +54,16 @@ def test_existing_ids_returns_only_trial_apps(sqlite_session_factory: sessionmak
assert result == frozenset({eligible_id})
-def test_existing_ids_skips_session_for_empty_input() -> None:
- session_factory = MagicMock(spec=sessionmaker)
+def test_existing_ids_skips_session_for_empty_input(
+ sqlite_session_factory: sessionmaker[Session], mocker: MockerFixture
+) -> None:
+ session_factory = sqlite_session_factory
+ open_session = mocker.spy(type(session_factory), "__call__")
result = TrialAppRepository(session_factory).existing_ids([])
assert result == frozenset()
- session_factory.assert_not_called()
+ open_session.assert_not_called()
def test_resolve_returns_actual_app_owner_and_account_usage(sqlite_session_factory: sessionmaker[Session]) -> None:
diff --git a/api/tests/unit_tests/services/agent/test_agent_services.py b/api/tests/unit_tests/services/agent/test_agent_services.py
index e4266eeed99..4c45bec5f56 100644
--- a/api/tests/unit_tests/services/agent/test_agent_services.py
+++ b/api/tests/unit_tests/services/agent/test_agent_services.py
@@ -7005,7 +7005,7 @@ def test_resolve_workflow_node_agent_id_degrades_without_workflow_or_binding(
)
-def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.MonkeyPatch):
+def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):
job = WorkflowNodeJobConfig.model_validate(
{
"workflow_prompt": "Keep this task",
@@ -7015,7 +7015,19 @@ def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.Monkey
},
}
)
- binding = WorkflowAgentNodeBinding(agent_id="old-agent", current_snapshot_id="old-snapshot", node_job_config=job)
+ binding = WorkflowAgentNodeBinding(
+ tenant_id="tenant-1",
+ app_id="app-1",
+ workflow_id="workflow-1",
+ node_id="node-1",
+ workflow_version="draft",
+ binding_type=WorkflowAgentBindingType.INLINE_AGENT,
+ agent_id="old-agent",
+ current_snapshot_id="old-snapshot",
+ node_job_config=job,
+ )
+ sqlite_session.add(binding)
+ sqlite_session.commit()
monkeypatch.setattr(
AgentComposerService,
"_create_roster_agent_for_composer",
@@ -7025,7 +7037,7 @@ def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.Monkey
"services.agent.composer_service.SkillManagementService.copy_agent_bindings", lambda self, **kwargs: None
)
result = AgentComposerService._save_as_new_agent(
- session=MagicMock(spec=Session),
+ session=sqlite_session,
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
@@ -7040,3 +7052,8 @@ def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.Monkey
)
assert result.agent_id == "new-agent"
assert result.node_job_config_dict == job.model_dump(mode="json")
+ sqlite_session.commit()
+ sqlite_session.expire_all()
+ persisted = sqlite_session.get(WorkflowAgentNodeBinding, result.id)
+ assert persisted is not None
+ assert persisted.node_job_config_dict == job.model_dump(mode="json")
diff --git a/api/tests/unit_tests/services/test_workflow_service.py b/api/tests/unit_tests/services/test_workflow_service.py
index da1ea117964..5953ba92626 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -18,6 +18,7 @@ from typing import Any, cast
from unittest.mock import ANY, MagicMock, patch, sentinel
import pytest
+from pytest_mock import MockerFixture
from sqlalchemy import event, select
from sqlalchemy.dialects import postgresql
from sqlalchemy.engine import Engine
@@ -363,11 +364,15 @@ class TestWorkflowService:
assert result is workflow
- def test_get_published_workflow_by_id_can_lock_restore_source(self, workflow_service: WorkflowService):
+ def test_get_published_workflow_by_id_can_lock_restore_source(
+ self, workflow_service: WorkflowService, sqlite_session: Session, mocker: MockerFixture
+ ):
app = TestWorkflowAssociatedDataFactory.create_app()
workflow = TestWorkflowAssociatedDataFactory.create_workflow(version="v1")
- session = MagicMock(spec=Session)
- session.scalar.return_value = workflow
+ session = sqlite_session
+ session.add(workflow)
+ session.commit()
+ lookup = mocker.spy(session, "scalar")
result = workflow_service.get_published_workflow_by_id(
app,
@@ -376,7 +381,7 @@ class TestWorkflowService:
for_update=True,
)
- stmt = session.scalar.call_args.args[0]
+ stmt = lookup.call_args.args[0]
sql = str(stmt.compile(dialect=postgresql.dialect()))
assert result is workflow
assert "FOR UPDATE" in sql
@@ -1759,24 +1764,30 @@ class TestWorkflowService:
for binding in non_target_bindings:
assert sqlite_session.get(WorkflowAgentNodeBinding, binding.id) is binding
- def test_delete_workflow_locks_source_until_caller_commits(self, workflow_service: WorkflowService):
+ def test_delete_workflow_locks_source_until_caller_commits(
+ self, workflow_service: WorkflowService, sqlite_session: Session, mocker: MockerFixture
+ ):
workflow = TestWorkflowAssociatedDataFactory.create_workflow(version="v1")
workflow_ref = WorkflowRef(
tenant_id=workflow.tenant_id,
owner_id=workflow.app_id,
workflow_id=workflow.id,
)
- session = MagicMock(spec=Session)
- session.scalar.side_effect = [workflow, None, None]
- session.scalars.return_value.all.return_value = []
+ session = sqlite_session
+ session.add(workflow)
+ session.commit()
+ lookup = mocker.spy(session, "scalar")
result = workflow_service.delete_workflow(session=session, workflow_ref=workflow_ref)
- stmt = session.scalar.call_args_list[0].args[0]
+ stmt = lookup.call_args_list[0].args[0]
sql = str(stmt.compile(dialect=postgresql.dialect()))
assert result == []
assert "FOR UPDATE" in sql
- session.delete.assert_called_once_with(workflow)
+ assert session.in_transaction()
+ assert workflow in session.deleted
+ session.commit()
+ assert session.get(Workflow, workflow.id) is None
def test_delete_workflow_with_ref_scopes_lookup_to_app(
self, workflow_service: WorkflowService, sqlite_session: Session
diff --git a/api/tests/unit_tests/test_pytest_timing.py b/api/tests/unit_tests/test_pytest_timing.py
index a0872f9d2e9..22212943594 100644
--- a/api/tests/unit_tests/test_pytest_timing.py
+++ b/api/tests/unit_tests/test_pytest_timing.py
@@ -2,7 +2,6 @@
from pathlib import Path
from typing import Literal
-from unittest.mock import MagicMock
import pytest
@@ -20,7 +19,9 @@ def report(nodeid: str, when: Literal["setup", "call", "teardown"], duration: fl
@pytest.mark.parametrize("exitstatus", [0, 1, 2, 3, 4, 5])
-def test_history_is_published_only_for_complete_success(tmp_path: Path, exitstatus: int) -> None:
+def test_history_is_published_only_for_complete_success(
+ tmp_path: Path, exitstatus: int, request: pytest.FixtureRequest
+) -> None:
import json
from tests.pytest_timing import TestDurationsPlugin
@@ -29,7 +30,7 @@ def test_history_is_published_only_for_complete_success(tmp_path: Path, exitstat
plugin = TestDurationsPlugin(destination)
for phase in ("setup", "call", "teardown"):
plugin.pytest_runtest_logreport(report("tests/test_file.py::test_a", phase, 2.0))
- plugin.pytest_sessionfinish(MagicMock(spec=pytest.Session), exitstatus)
+ plugin.pytest_sessionfinish(request.session, exitstatus)
if exitstatus == 0:
assert json.loads(destination.read_text()) == {"api/tests/test_file.py": 6.0}
else: