From 79133af9604c6eb2cc731018c398fcb9d0696029 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 18 Jul 2024 18:04:56 +0200 Subject: [PATCH] fix test Signed-off-by: Tim Vaillancourt --- go/vt/discovery/healthcheck_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go/vt/discovery/healthcheck_test.go b/go/vt/discovery/healthcheck_test.go index 5a869f3dafd..28a0dcf91fe 100644 --- 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)