From 4aa2482e937041c7ee3483819fc72c096e1a0c00 Mon Sep 17 00:00:00 2001 From: Susana Ferreira Date: Fri, 19 Jun 2026 10:23:18 +0100 Subject: [PATCH] fix: alias coder testutil to resolve import collision (#26540) PRs https://github.com/coder/coder/pull/26092 and https://github.com/coder/coder/pull/26519 both landed on main and the circuit breaker test file ended up importing both `aibridge/internal/testutil` and `coder/v2/testutil` under the same name, causing a redeclaration error and breaking `make lint`. Alias the latter as `codertestutil`, matching the convention already used in `passthrough_internal_test.go` and `keyfailover_test.go`. --- .../integrationtest/circuit_breaker_internal_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aibridge/internal/integrationtest/circuit_breaker_internal_test.go b/aibridge/internal/integrationtest/circuit_breaker_internal_test.go index 990382c73e..e9909b5ae3 100644 --- a/aibridge/internal/integrationtest/circuit_breaker_internal_test.go +++ b/aibridge/internal/integrationtest/circuit_breaker_internal_test.go @@ -20,7 +20,7 @@ import ( "github.com/coder/coder/v2/aibridge/internal/testutil" "github.com/coder/coder/v2/aibridge/metrics" "github.com/coder/coder/v2/aibridge/provider" - "github.com/coder/coder/v2/testutil" + codertestutil "github.com/coder/coder/v2/testutil" ) // Common response bodies for circuit breaker tests. @@ -127,7 +127,7 @@ func TestCircuitBreaker_FullRecoveryCycle(t *testing.T) { cbConfig := &config.CircuitBreaker{ FailureThreshold: 2, Interval: time.Minute, - Timeout: testutil.IntervalMedium, + Timeout: codertestutil.IntervalMedium, MaxRequests: 1, } @@ -284,7 +284,7 @@ func TestCircuitBreaker_HalfOpenFailure(t *testing.T) { cbConfig := &config.CircuitBreaker{ FailureThreshold: 2, Interval: time.Minute, - Timeout: testutil.IntervalMedium, + Timeout: codertestutil.IntervalMedium, MaxRequests: 1, } @@ -432,7 +432,7 @@ func TestCircuitBreaker_HalfOpenMaxRequests(t *testing.T) { cbConfig := &config.CircuitBreaker{ FailureThreshold: 2, Interval: time.Minute, - Timeout: testutil.IntervalMedium, + Timeout: codertestutil.IntervalMedium, MaxRequests: maxRequests, // Allow only 2 concurrent requests in half-open }