From a0fd62a6892666e97b687dbd4f448abd9a8d62da Mon Sep 17 00:00:00 2001 From: Michael Fletcher Date: Fri, 10 Apr 2026 15:03:36 +0100 Subject: [PATCH 1/3] fix(test): use unique bridge names and relaxed count assertions TestORM_UpdateBridgeType used a hardcoded "UniqueName" and asserted the global bridge count was exactly 1. With shared DB state from parallel tests or -count=N, the global count includes other bridges. Use UUID-based names and assert >= 1 instead of exact count. Verify deletion by checking the specific bridge is not found. Fixes: CORE-2391 --- core/bridges/orm_test.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/bridges/orm_test.go b/core/bridges/orm_test.go index 2ef6807f841..8f981024b07 100644 --- a/core/bridges/orm_test.go +++ b/core/bridges/orm_test.go @@ -107,8 +107,9 @@ func TestORM_UpdateBridgeType(t *testing.T) { ctx := testutils.Context(t) _, orm := setupORM(t) + bridgeName := bridges.BridgeName("bridge-" + uuid.New().String()[:8]) firstBridge := &bridges.BridgeType{ - Name: "UniqueName", + Name: bridgeName, URL: cltest.WebURL(t, "http:/oneurl.com"), } @@ -120,21 +121,19 @@ func TestORM_UpdateBridgeType(t *testing.T) { require.NoError(t, orm.UpdateBridgeType(ctx, firstBridge, updateBridge)) - foundbridge, err := orm.FindBridge(ctx, "UniqueName") + foundbridge, err := orm.FindBridge(ctx, bridgeName) require.NoError(t, err) require.Equal(t, updateBridge.URL, foundbridge.URL) bs, count, err := orm.BridgeTypes(ctx, 0, 10) require.NoError(t, err) - require.Equal(t, 1, count) - require.Len(t, bs, 1) + require.GreaterOrEqual(t, count, 1) + require.GreaterOrEqual(t, len(bs), 1) require.NoError(t, orm.DeleteBridgeType(ctx, &foundbridge)) - bs, count, err = orm.BridgeTypes(ctx, 0, 10) - require.NoError(t, err) - require.Equal(t, 0, count) - require.Empty(t, bs) + _, err = orm.FindBridge(ctx, bridgeName) + require.Error(t, err) } func TestORM_TestCachedResponse(t *testing.T) { From 82badeda8481895833515bd598bf75020cc34382 Mon Sep 17 00:00:00 2001 From: Michael Fletcher Date: Fri, 10 Apr 2026 17:51:46 +0100 Subject: [PATCH 2/3] fix(test): drop global count assertion, verify specific bridge only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GreaterOrEqual count check was still fragile. The test only needs to verify its own bridge exists and can be deleted — not count how many bridges exist globally. Fixes: CORE-2391 --- core/bridges/orm_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/bridges/orm_test.go b/core/bridges/orm_test.go index 8f981024b07..64a1513d3ff 100644 --- a/core/bridges/orm_test.go +++ b/core/bridges/orm_test.go @@ -125,11 +125,6 @@ func TestORM_UpdateBridgeType(t *testing.T) { require.NoError(t, err) require.Equal(t, updateBridge.URL, foundbridge.URL) - bs, count, err := orm.BridgeTypes(ctx, 0, 10) - require.NoError(t, err) - require.GreaterOrEqual(t, count, 1) - require.GreaterOrEqual(t, len(bs), 1) - require.NoError(t, orm.DeleteBridgeType(ctx, &foundbridge)) _, err = orm.FindBridge(ctx, bridgeName) From 34d314dd3389230a4684d5a8f70389559ce56de0 Mon Sep 17 00:00:00 2001 From: Michael Fletcher Date: Fri, 10 Apr 2026 17:56:34 +0100 Subject: [PATCH 3/3] fix(test): restore exact count assertions with UUID bridge names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The txdb wrapper should provide per-test transaction isolation, so exact count assertions are valid. Restore them — if CI fails, the real bug is broken DB isolation, not the test. The only change from the original test is UUID-based bridge names to avoid hardcoded "UniqueName" collisions. Fixes: CORE-2391 --- core/bridges/orm_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/bridges/orm_test.go b/core/bridges/orm_test.go index 64a1513d3ff..3969e226aed 100644 --- a/core/bridges/orm_test.go +++ b/core/bridges/orm_test.go @@ -125,10 +125,17 @@ func TestORM_UpdateBridgeType(t *testing.T) { require.NoError(t, err) require.Equal(t, updateBridge.URL, foundbridge.URL) + bs, count, err := orm.BridgeTypes(ctx, 0, 10) + require.NoError(t, err) + require.Equal(t, 1, count) + require.Len(t, bs, 1) + require.NoError(t, orm.DeleteBridgeType(ctx, &foundbridge)) - _, err = orm.FindBridge(ctx, bridgeName) - require.Error(t, err) + bs, count, err = orm.BridgeTypes(ctx, 0, 10) + require.NoError(t, err) + require.Equal(t, 0, count) + require.Empty(t, bs) } func TestORM_TestCachedResponse(t *testing.T) {