fix conflicts

Signed-off-by: Tim Vaillancourt <[email protected]>
vitessio · Oct 5, 2024 · 4c7f3fa · 4c7f3fa
1 parent dc9f076
commit 4c7f3fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/go/vt/throttler/replication_lag_cache_test.go b/go/vt/throttler/replication_lag_cache_test.go
@@ -20,6 +20,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"vitess.io/vitess/go/vt/discovery"
 )
 

diff --git a/go/vt/throttler/throttler_test.go b/go/vt/throttler/throttler_test.go
@@ -19,11 +19,7 @@ package throttler
 import (
 	"context"
 	"runtime"
-<<<<<<< HEAD
 	"strings"
-	"testing"
-	"time"
-=======
 	"sync"
 	"testing"
 	"time"
@@ -33,7 +29,6 @@ import (
 	"vitess.io/vitess/go/vt/discovery"
 	"vitess.io/vitess/go/vt/proto/query"
 	"vitess.io/vitess/go/vt/proto/topodata"
->>>>>>> 9b999b2a00 (Fix race in `replicationLagModule` of `go/vt/throttle` (#16078))
 )
 
 // testTabletTypes is the list of tablet types to test.
@@ -448,9 +443,8 @@ func TestThreadFinished_SecondCallPanics(t *testing.T) {
 
 func TestThrottlerMaxLag(t *testing.T) {
 	fc := &fakeClock{}
-	th, err := newThrottlerWithClock(t.Name(), "queries", 1, 1, 10, fc.now)
+	throttler, err := newThrottlerWithClock(t.Name(), "queries", 1, 1, 10, fc.now)
 	require.NoError(t, err)
-	throttler := th.(*ThrottlerImpl)
 	defer throttler.Close()
 
 	require.NotNil(t, throttler)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ import ( @@
     	"testing"
     	"time"
+    	"github.com/stretchr/testify/require"
     	"vitess.io/vitess/go/vt/discovery"
     )
@@ Expand Down @@