opensource/dify
3
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-24 23:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix delete logs failed (#36151)

Browse Source 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
wangxiaolei
2026-05-14 08:02:31 +00:00
committed by GitHub
co-authored by autofix-ci[bot]
parent a9bcec013f
commit d9ccfcbc6e
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
+25 -2
View File
@@ -304,8 +304,11 @@ def test_process_tenant_processes_all_batches(monkeypatch: pytest.MonkeyPatch) -
monkeypatch.setattr(service_module, "select", fake_select)
# Repositories for workflow node executions and workflow runs
node_execution = SimpleNamespace(id="ne-1")
node_execution.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
node_repo = MagicMock()
node_repo.get_expired_executions_batch.side_effect = [[SimpleNamespace(id="ne-1")], []]
node_repo.get_expired_executions_batch.side_effect = [[node_execution], []]
node_repo.delete_executions_by_ids.return_value = 1
run_repo = MagicMock()
@@ -329,6 +332,21 @@ def test_process_tenant_processes_all_batches(monkeypatch: pytest.MonkeyPatch) -
clear_related.assert_called()
def test_serialize_record_falls_back_to_table_columns() -> None:
record = SimpleNamespace(id="ne-1", node_id="node-1")
record.__table__ = SimpleNamespace(
columns=[
SimpleNamespace(name="id"),
SimpleNamespace(name="node_id"),
]
)
assert ClearFreePlanTenantExpiredLogs._serialize_record(record) == {
"id": "ne-1",
"node_id": "node-1",
}
def test_process_with_tenant_ids_filters_by_plan_and_logs_errors(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(service_module, "db", SimpleNamespace(engine=object()))
@@ -533,9 +551,14 @@ def test_process_tenant_repo_loops_break_on_empty_second_batch(monkeypatch: pyte
monkeypatch.setattr(service_module, "select", fake_select)
# Repos: first returns exactly batch items -> no "< batch" break, second returns [] -> hit the len==0 break.
node_execution_1 = SimpleNamespace(id="ne-1")
node_execution_1.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
node_execution_2 = SimpleNamespace(id="ne-2")
node_execution_2.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
node_repo = MagicMock()
node_repo.get_expired_executions_batch.side_effect = [
[SimpleNamespace(id="ne-1"), SimpleNamespace(id="ne-2")],
[node_execution_1, node_execution_2],
[],
]
node_repo.delete_executions_by_ids.return_value = 2