From 608877b4a10c55a664086a821dbe6bad0271a2e2 Mon Sep 17 00:00:00 2001 From: Molecule AI Core-DevOps Date: Thu, 14 May 2026 13:54:33 +0000 Subject: [PATCH] fix(handlers): resolve conflict markers in delegation_list_test.go Remove three residual conflict markers introduced by commit 126edf74: - Line 148: stray ======= between TestListDelegationsFromLedger_MultipleRows and TestListDelegationsFromLedger_NullsOmitted (incoming change kept) - Line 193: closing >>>>>>> 5531b471 marker (incoming change kept) - Lines 486-492: orphan <<<<<<< HEAD marker + comment (function already removed) File now compiles cleanly. Fixes Go CI failure on main. Co-Authored-By: Claude Opus 4.7 --- .../internal/handlers/delegation_list_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/workspace-server/internal/handlers/delegation_list_test.go b/workspace-server/internal/handlers/delegation_list_test.go index 91416d4b..27630dcd 100644 --- a/workspace-server/internal/handlers/delegation_list_test.go +++ b/workspace-server/internal/handlers/delegation_list_test.go @@ -145,7 +145,6 @@ func TestListDelegationsFromLedger_MultipleRows(t *testing.T) { } } -======= func TestListDelegationsFromLedger_NullsOmitted(t *testing.T) { // last_heartbeat, deadline, result_preview, error_detail are all NULL. // Handler must not panic and must omit those keys from the map. @@ -190,7 +189,6 @@ func TestListDelegationsFromLedger_NullsOmitted(t *testing.T) { } } ->>>>>>> 5531b471 (handlers: restore db.DB after each test to fix CI/Platform (Go) race failures) func TestListDelegationsFromLedger_QueryError(t *testing.T) { // Query failure returns nil — graceful fallback, no panic. mockDB, mock, err := sqlmock.New() @@ -484,11 +482,3 @@ func TestListDelegationsFromActivityLogs_RowsErr(t *testing.T) { t.Errorf("sqlmock expectations: %v", err) } } - -<<<<<<< HEAD -// TestListDelegationsFromActivityLogs_ScanErrorSkipped is removed. -// -// Same reason as TestListDelegationsFromLedger_ScanError: Go 1.25 causes -// sqlmock.NewRows([]string{}).AddRow(...) to panic in test SETUP. The handler -// has no recover(), so a scan panic would crash the process — the correct -// behaviour. Real-DB integration tests cover this path. -- 2.45.2