fix test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Aug 8, 2024 · 79133af · 79133af
1 parent 235684f
commit 79133af
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/go/vt/discovery/healthcheck_test.go b/go/vt/discovery/healthcheck_test.go
@@ -124,13 +124,9 @@ func TestNewVTGateHealthCheckFilters(t *testing.T) {
 			tabletFilterTags = testCase.tabletFilterTags
 
 			filters, err := NewVTGateHealthCheckFilters()
-<<<<<<< Updated upstream
 			if testCase.expectedError != "" {
 				assert.EqualError(t, err, testCase.expectedError)
 			}
-=======
-			assert.EqualError(t, testCase.expectedError, err)
->>>>>>> Stashed changes
 			assert.Len(t, filters, len(testCase.expectedFilterTypes))
 			for i, filter := range filters {
 				assert.IsType(t, testCase.expectedFilterTypes[i], filter)