fix

Signed-off-by: Ari1009 <arihant0pal@gmail.com>
vitessio · Jun 2, 2024 · e0eee4f · e0eee4f
1 parent ab6c7af
commit e0eee4f
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 125 deletions.
diff --git a/go/tools/asthelpergen/asthelpergen_test.go b/go/tools/asthelpergen/asthelpergen_test.go
@@ -21,6 +21,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -42,8 +43,6 @@ func TestFullGeneration(t *testing.T) {
 		require.Contains(t, contents, "http://www.apache.org/licenses/LICENSE-2.0")
 		applyIdx := strings.Index(contents, "func (a *application) apply(parent, node AST, replacer replacerFunc)")
 		cloneIdx := strings.Index(contents, "CloneAST(in AST) AST")
-		if applyIdx == 0 && cloneIdx == 0 {
-			t.Fatalf("file doesn't contain expected contents")
-		}
+		assert.False(t, applyIdx == 0 && cloneIdx == 0, "file doesn't contain expected contents")
 	}
 }
diff --git a/go/trace/trace_test.go b/go/trace/trace_test.go
@@ -62,11 +62,11 @@ func TestRegisterService(t *testing.T) {
 	closer := StartTracing(serviceName)
 	tracer, ok := closer.(*fakeTracer)
 	if !ok {
-		t.Fatalf("did not get the expected tracer, got %+v (%T)", tracer, tracer)
+		require.FailNow(t, fmt.Sprintf("did not get the expected tracer, got %+v (%T)", tracer, tracer))
 	}
 
 	if tracer.name != serviceName {
-		t.Fatalf("expected the name to be `%v` but it was `%v`", serviceName, tracer.name)
+		require.FailNow(t, fmt.Sprintf("expected the name to be `%v` but it was `%v`", serviceName, tracer.name))
 	}
 }
 

diff --git a/go/vt/binlog/binlog_streamer_rbr_test.go b/go/vt/binlog/binlog_streamer_rbr_test.go
@@ -21,6 +21,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/binlog"
 	"vitess.io/vitess/go/mysql/collations"
@@ -519,17 +521,12 @@ func TestStreamerParseRBRNameEscapes(t *testing.T) {
 
 	go sendTestEvents(events, input)
 	_, err := bls.parseEvents(context.Background(), events, errs)
-	if err != ErrServerEOF {
-		t.Errorf("unexpected error: %v", err)
-	}
+	require.Equal(t, ErrServerEOF, err, "unexpected error: %v", err)
 
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("binlogConnStreamer.parseEvents(): got:\n%+v\nwant:\n%+v", got, want)
-		for i, fbt := range got {
-			t.Errorf("Got (%v)=%v", i, fbt.statements)
-		}
-		for i, fbt := range want {
-			t.Errorf("Want(%v)=%v", i, fbt.statements)
-		}
+	assert.True(t, reflect.DeepEqual(got, want), "binlogConnStreamer.parseEvents(): got:\n%+v\nwant:\n%+v", got, want)
+
+	for i, fbt := range got {
+		assert.Equal(t, fbt.statements, want[i].statements, "Got (%v)=%v, want (%v)=%v", i, fbt.statements, i, want[i].statements)
 	}
+
 }
diff --git a/go/vt/binlog/tables_filter_test.go b/go/vt/binlog/tables_filter_test.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 )
@@ -60,9 +61,7 @@ func TestTablesFilterPass(t *testing.T) {
 	})
 	_ = f(eventToken, statements)
 	want := `statement: <6, "set1"> statement: <7, "dml1 /* _stream included1 (id ) (500 ); */"> statement: <7, "dml2 /* _stream included2 (id ) (500 ); */"> position: "MariaDB/0-41983-1" `
-	if want != got {
-		t.Errorf("want\n%s, got\n%s", want, got)
-	}
+	assert.Equal(t, want, got, "binlogConnStreamer.tablesFilterFunc(): got:\n%+v\nwant:\n%+v", got, want)
 }
 
 func TestTablesFilterSkip(t *testing.T) {
@@ -90,9 +89,7 @@ func TestTablesFilterSkip(t *testing.T) {
 	})
 	_ = f(eventToken, statements)
 	want := `position: "MariaDB/0-41983-1" `
-	if want != got {
-		t.Errorf("want %s, got %s", want, got)
-	}
+	assert.Equal(t, want, got, "binlogConnStreamer.tablesFilterFunc(): got:\n%+v\nwant:\n%+v", got, want)
 }
 
 func TestTablesFilterDDL(t *testing.T) {
@@ -120,9 +117,7 @@ func TestTablesFilterDDL(t *testing.T) {
 	})
 	_ = f(eventToken, statements)
 	want := `position: "MariaDB/0-41983-1" `
-	if want != got {
-		t.Errorf("want %s, got %s", want, got)
-	}
+	assert.Equal(t, want, got, "binlogConnStreamer.tablesFilterFunc(): got:\n%+v\nwant:\n%+v", got, want)
 }
 
 func TestTablesFilterMalformed(t *testing.T) {
@@ -156,9 +151,7 @@ func TestTablesFilterMalformed(t *testing.T) {
 	})
 	_ = f(eventToken, statements)
 	want := `position: "MariaDB/0-41983-1" `
-	if want != got {
-		t.Errorf("want %s, got %s", want, got)
-	}
+	assert.Equal(t, want, got, "binlogConnStreamer.tablesFilterFunc(): got:\n%+v\nwant:\n%+v", got, want)
 }
 
 func bltToString(tx *binlogdatapb.BinlogTransaction) string {

diff --git a/go/vt/wrangler/tablet_test.go b/go/vt/wrangler/tablet_test.go
@@ -18,9 +18,9 @@ package wrangler
 
 import (
 	"context"
-	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"vitess.io/vitess/go/vt/logutil"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/topo"
@@ -48,20 +48,14 @@ func TestInitTabletShardConversion(t *testing.T) {
 		Shard:    "80-C0",
 	}
 
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
+	err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
 
 	ti, err := ts.GetTablet(context.Background(), tablet.Alias)
-	if err != nil {
-		t.Fatalf("GetTablet failed: %v", err)
-	}
-	if ti.Shard != "80-c0" {
-		t.Errorf("Got wrong tablet.Shard, got %v expected 80-c0", ti.Shard)
-	}
-	if string(ti.KeyRange.Start) != "\x80" || string(ti.KeyRange.End) != "\xc0" {
-		t.Errorf("Got wrong tablet.KeyRange, got %v expected 80-c0", ti.KeyRange)
-	}
+	require.NoError(t, err, "GetTablet failed")
+	require.Equal(t, "80-c0", ti.Shard, "Got wrong tablet.Shard")
+	require.Equal(t, "\x80", string(ti.KeyRange.Start), "Got wrong tablet.KeyRange start")
+	require.Equal(t, "\xc0", string(ti.KeyRange.End), "Got wrong tablet.KeyRange end")
 }
 
 // TestDeleteTabletBasic tests delete of non-primary tablet
@@ -82,17 +76,14 @@ func TestDeleteTabletBasic(t *testing.T) {
 		Keyspace: "test",
 	}
 
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
+	err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
 
-	if _, err := ts.GetTablet(context.Background(), tablet.Alias); err != nil {
-		t.Fatalf("GetTablet failed: %v", err)
-	}
+	_, err = ts.GetTablet(context.Background(), tablet.Alias)
+	require.NoError(t, err, "GetTablet failed")
 
-	if err := wr.DeleteTablet(context.Background(), tablet.Alias, false); err != nil {
-		t.Fatalf("DeleteTablet failed: %v", err)
-	}
+	err = wr.DeleteTablet(context.Background(), tablet.Alias, false)
+	require.NoError(t, err, "DeleteTablet failed")
 }
 
 // TestDeleteTabletTruePrimary tests that you can delete a true primary tablet
@@ -115,31 +106,27 @@ func TestDeleteTabletTruePrimary(t *testing.T) {
 		Type:     topodatapb.TabletType_PRIMARY,
 	}
 
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
-	if _, err := ts.GetTablet(context.Background(), tablet.Alias); err != nil {
-		t.Fatalf("GetTablet failed: %v", err)
-	}
+	err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
+
+	_, err = ts.GetTablet(context.Background(), tablet.Alias)
+	require.NoError(t, err, "GetTablet failed")
 
 	// set PrimaryAlias and PrimaryTermStartTime on shard to match chosen primary tablet
-	if _, err := ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
+	_, err = ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
 		si.PrimaryAlias = tablet.Alias
 		si.PrimaryTermStartTime = tablet.PrimaryTermStartTime
 		return nil
-	}); err != nil {
-		t.Fatalf("UpdateShardFields failed: %v", err)
-	}
+	})
+	require.NoError(t, err, "UpdateShardFields failed")
 
-	err := wr.DeleteTablet(context.Background(), tablet.Alias, false)
+	err = wr.DeleteTablet(context.Background(), tablet.Alias, false)
 	wantError := "as it is a primary, use allow_primary flag"
-	if err == nil || !strings.Contains(err.Error(), wantError) {
-		t.Fatalf("DeleteTablet on primary: want error = %v, got error = %v", wantError, err)
-	}
+	require.Error(t, err, "DeleteTablet on primary: want error")
+	require.Contains(t, err.Error(), wantError, "DeleteTablet on primary: want specific error message")
 
-	if err := wr.DeleteTablet(context.Background(), tablet.Alias, true); err != nil {
-		t.Fatalf("DeleteTablet failed: %v", err)
-	}
+	err = wr.DeleteTablet(context.Background(), tablet.Alias, true)
+	require.NoError(t, err, "DeleteTablet failed")
 }
 
 // TestDeleteTabletFalsePrimary tests that you can delete a false primary tablet
@@ -162,9 +149,8 @@ func TestDeleteTabletFalsePrimary(t *testing.T) {
 		Type:     topodatapb.TabletType_PRIMARY,
 	}
 
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet1, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
+	err := wr.TopoServer().InitTablet(context.Background(), tablet1, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
 
 	tablet2 := &topodatapb.Tablet{
 		Alias: &topodatapb.TabletAlias{
@@ -175,23 +161,20 @@ func TestDeleteTabletFalsePrimary(t *testing.T) {
 		Shard:    "0",
 		Type:     topodatapb.TabletType_PRIMARY,
 	}
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet2, true /*allowPrimaryOverride*/, false /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
+	err = wr.TopoServer().InitTablet(context.Background(), tablet2, true /*allowPrimaryOverride*/, false /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
 
 	// set PrimaryAlias and PrimaryTermStartTime on shard to match chosen primary tablet
-	if _, err := ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
+	_, err = ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
 		si.PrimaryAlias = tablet2.Alias
 		si.PrimaryTermStartTime = tablet2.PrimaryTermStartTime
 		return nil
-	}); err != nil {
-		t.Fatalf("UpdateShardFields failed: %v", err)
-	}
+	})
+	require.NoError(t, err, "UpdateShardFields failed")
 
 	// Should be able to delete old (false) primary with allowPrimary = false
-	if err := wr.DeleteTablet(context.Background(), tablet1.Alias, false); err != nil {
-		t.Fatalf("DeleteTablet failed: %v", err)
-	}
+	err = wr.DeleteTablet(context.Background(), tablet1.Alias, false)
+	require.NoError(t, err, "DeleteTablet failed")
 }
 
 // TestDeleteTabletShardNonExisting tests that you can delete a true primary
@@ -214,29 +197,25 @@ func TestDeleteTabletShardNonExisting(t *testing.T) {
 		Type:     topodatapb.TabletType_PRIMARY,
 	}
 
-	if err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/); err != nil {
-		t.Fatalf("InitTablet failed: %v", err)
-	}
-	if _, err := ts.GetTablet(context.Background(), tablet.Alias); err != nil {
-		t.Fatalf("GetTablet failed: %v", err)
-	}
+	err := wr.TopoServer().InitTablet(context.Background(), tablet, false /*allowPrimaryOverride*/, true /*createShardAndKeyspace*/, false /*allowUpdate*/)
+	require.NoError(t, err, "InitTablet failed")
+
+	_, err = ts.GetTablet(context.Background(), tablet.Alias)
+	require.NoError(t, err, "GetTablet failed")
 
 	// set PrimaryAlias and PrimaryTermStartTime on shard to match chosen primary tablet
-	if _, err := ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
+	_, err = ts.UpdateShardFields(context.Background(), "test", "0", func(si *topo.ShardInfo) error {
 		si.PrimaryAlias = tablet.Alias
 		si.PrimaryTermStartTime = tablet.PrimaryTermStartTime
 		return nil
-	}); err != nil {
-		t.Fatalf("UpdateShardFields failed: %v", err)
-	}
+	})
+	require.NoError(t, err, "UpdateShardFields failed")
 
 	// trigger a shard deletion
-	if err := ts.DeleteShard(context.Background(), "test", "0"); err != nil {
-		t.Fatalf("DeleteShard failed: %v", err)
-	}
+	err = ts.DeleteShard(context.Background(), "test", "0")
+	require.NoError(t, err, "DeleteShard failed")
 
 	// DeleteTablet should not fail if a shard no longer exist
-	if err := wr.DeleteTablet(context.Background(), tablet.Alias, true); err != nil {
-		t.Fatalf("DeleteTablet failed: %v", err)
-	}
+	err = wr.DeleteTablet(context.Background(), tablet.Alias, true)
+	require.NoError(t, err, "DeleteTablet failed")
 }
diff --git a/go/vt/wrangler/vexec_test.go b/go/vt/wrangler/vexec_test.go
@@ -26,6 +26,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/sqltypes"
@@ -151,15 +152,11 @@ func TestVExec(t *testing.T) {
 			if testCase.errorString == "" {
 				require.NoError(t, err)
 				for _, result := range results {
-					if !testCase.result.Equal(result) {
-						t.Errorf("mismatched result:\nwant: %v\ngot:  %v", testCase.result, result)
-					}
+					assert.True(t, testCase.result.Equal(result), "mismatched result:\nwant: %v\ngot:  %v", testCase.result, result)
 				}
 			} else {
 				require.Error(t, err)
-				if !strings.Contains(err.Error(), testCase.errorString) {
-					t.Fatalf("Wrong error, want %s, got %s", testCase.errorString, err.Error())
-				}
+				assert.Contains(t, err.Error(), testCase.errorString, "Wrong error, want %s, got %s", testCase.errorString, err.Error())
 			}
 		})
 	}