Skip to content

fix minor code unreachability error #10771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepthi merged 1 commit into from
Aug 16, 2022
Merged

fix minor code unreachability error #10771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions go/vt/sqlparser/parse_next_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion go/vt/topo/helpers/copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}{}
Expand Down
7 changes: 3 additions & 4 deletions go/vt/topo/k8stopo/server_flaky_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{}

Expand Down