From ac9d81f892ec7d8e688074601706ee5866aaa1e2 Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Thu, 21 Jul 2022 13:59:08 +0800 Subject: [PATCH] fix minor code unreachability error Signed-off-by: Abirdcfly --- go/vt/sqlparser/parse_next_test.go | 10 ++-------- go/vt/topo/helpers/copy.go | 1 - go/vt/topo/k8stopo/server_flaky_test.go | 7 +++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/go/vt/sqlparser/parse_next_test.go b/go/vt/sqlparser/parse_next_test.go index f9ab7639303..149dc0bb067 100644 --- a/go/vt/sqlparser/parse_next_test.go +++ b/go/vt/sqlparser/parse_next_test.go @@ -44,10 +44,7 @@ func TestParseNextValid(t *testing.T) { } tree, err := ParseNext(tokens) - if err != nil { - t.Fatalf("[%d] ParseNext(%q) err: %q, want nil", i, input, err) - continue - } + require.NoError(t, err) if got := String(tree); got != want { t.Fatalf("[%d] ParseNext(%q) = %q, want %q", i, input, got, want) @@ -148,10 +145,7 @@ func TestParseNextEdgeCases(t *testing.T) { for i, want := range test.want { tree, err := ParseNext(tokens) - if err != nil { - t.Fatalf("[%d] ParseNext(%q) err = %q, want nil", i, test.input, err) - continue - } + require.NoError(t, err) if got := String(tree); got != want { t.Fatalf("[%d] ParseNext(%q) = %q, want %q", i, test.input, got, want) diff --git a/go/vt/topo/helpers/copy.go b/go/vt/topo/helpers/copy.go index bc32861e9eb..f0ae912243b 100644 --- a/go/vt/topo/helpers/copy.go +++ b/go/vt/topo/helpers/copy.go @@ -166,7 +166,6 @@ func CopyShardReplications(ctx context.Context, fromTS, toTS *topo.Server) { sri, err := fromTS.GetShardReplication(ctx, cell, keyspace, shard) if err != nil { log.Fatalf("GetShardReplication(%v, %v, %v): %v", cell, keyspace, shard, err) - continue } sriNodes := map[string]struct{}{} diff --git a/go/vt/topo/k8stopo/server_flaky_test.go b/go/vt/topo/k8stopo/server_flaky_test.go index c2c97796581..54e71da008f 100644 --- a/go/vt/topo/k8stopo/server_flaky_test.go +++ b/go/vt/topo/k8stopo/server_flaky_test.go @@ -27,6 +27,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -97,10 +98,8 @@ func TestKubernetesTopo(t *testing.T) { } crdFile, err := os.Open("./VitessTopoNodes-crd.yaml") - if err != nil { - t.Fatal(err) - defer crdFile.Close() - } + require.NoError(t, err) + defer crdFile.Close() crd := &extensionsv1.CustomResourceDefinition{}