Skip to content

Commit ac9d81f

Browse files
committed
fix minor code unreachability error
Signed-off-by: Abirdcfly <[email protected]>
1 parent bf13249 commit ac9d81f

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

go/vt/sqlparser/parse_next_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ func TestParseNextValid(t *testing.T) {
4444
}
4545

4646
tree, err := ParseNext(tokens)
47-
if err != nil {
48-
t.Fatalf("[%d] ParseNext(%q) err: %q, want nil", i, input, err)
49-
continue
50-
}
47+
require.NoError(t, err)
5148

5249
if got := String(tree); got != want {
5350
t.Fatalf("[%d] ParseNext(%q) = %q, want %q", i, input, got, want)
@@ -148,10 +145,7 @@ func TestParseNextEdgeCases(t *testing.T) {
148145

149146
for i, want := range test.want {
150147
tree, err := ParseNext(tokens)
151-
if err != nil {
152-
t.Fatalf("[%d] ParseNext(%q) err = %q, want nil", i, test.input, err)
153-
continue
154-
}
148+
require.NoError(t, err)
155149

156150
if got := String(tree); got != want {
157151
t.Fatalf("[%d] ParseNext(%q) = %q, want %q", i, test.input, got, want)

go/vt/topo/helpers/copy.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ func CopyShardReplications(ctx context.Context, fromTS, toTS *topo.Server) {
166166
sri, err := fromTS.GetShardReplication(ctx, cell, keyspace, shard)
167167
if err != nil {
168168
log.Fatalf("GetShardReplication(%v, %v, %v): %v", cell, keyspace, shard, err)
169-
continue
170169
}
171170

172171
sriNodes := map[string]struct{}{}

go/vt/topo/k8stopo/server_flaky_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"testing"
2828
"time"
2929

30+
"github.com/stretchr/testify/require"
3031
extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3132
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
3233
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -97,10 +98,8 @@ func TestKubernetesTopo(t *testing.T) {
9798
}
9899

99100
crdFile, err := os.Open("./VitessTopoNodes-crd.yaml")
100-
if err != nil {
101-
t.Fatal(err)
102-
defer crdFile.Close()
103-
}
101+
require.NoError(t, err)
102+
defer crdFile.Close()
104103

105104
crd := &extensionsv1.CustomResourceDefinition{}
106105

0 commit comments

Comments
 (0)