From b60089489d8e3cc53b62684e3401ba4018f48dbb Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Mon, 22 Jan 2024 15:41:44 +0100 Subject: [PATCH] Remove usage of additional test package (#15007) Signed-off-by: Dirkjan Bussink --- go.mod | 3 +-- go.sum | 2 -- go/mysql/collations/colldata/uca_tables_test.go | 3 +-- go/test/endtoend/vtgate/vindex_bindvars/main_test.go | 2 +- go/vt/vtctl/vdiff2_test.go | 2 +- go/vt/vtctl/workflow/log_recorder_test.go | 2 +- go/vt/vttablet/endtoend/acl_test.go | 2 +- go/vt/wrangler/log_recorder_test.go | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 1fedc151516..7f9a3c0fbd5 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/klauspost/compress v1.17.4 github.com/klauspost/pgzip v1.2.6 github.com/krishicks/yaml-patch v0.0.10 - github.com/magiconair/properties v1.8.7 + github.com/magiconair/properties v1.8.7 // indirect github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 github.com/montanaflynn/stats v0.7.1 github.com/olekukonko/tablewriter v0.0.5 @@ -88,7 +88,6 @@ require ( gopkg.in/DataDog/dd-trace-go.v1 v1.59.0 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/ldap.v2 v2.5.1 - gotest.tools v2.2.0+incompatible sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index c0c4d00f01c..2e1681f56c2 100644 --- a/go.sum +++ b/go.sum @@ -782,8 +782,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/gotraceui v0.2.0 h1:dmNsfQ9Vl3GwbiVD7Z8d/osC6WtGGrasyrC2suc4ZIQ= honnef.co/go/gotraceui v0.2.0/go.mod h1:qHo4/W75cA3bX0QQoSvDjbJa4R8mAyyFjbWAj63XElc= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/go/mysql/collations/colldata/uca_tables_test.go b/go/mysql/collations/colldata/uca_tables_test.go index 2071e0630cd..ee982b1f25c 100644 --- a/go/mysql/collations/colldata/uca_tables_test.go +++ b/go/mysql/collations/colldata/uca_tables_test.go @@ -24,8 +24,8 @@ import ( "testing" "unsafe" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gotest.tools/assert" "vitess.io/vitess/go/mysql/collations/charset" "vitess.io/vitess/go/mysql/collations/internal/uca" @@ -58,7 +58,6 @@ func verifyAllCodepoints(t *testing.T, expected map[rune][]uint16, weights uca.W for i := range vitessWeights { a, b := mysqlWeights[i], vitessWeights[i] assert.Equal(t, b, a, "weight mismatch for U+%04X (collation entity %d): mysql=%v vitess=%v", cp, i+1, a, b) - } } } diff --git a/go/test/endtoend/vtgate/vindex_bindvars/main_test.go b/go/test/endtoend/vtgate/vindex_bindvars/main_test.go index 83e20d9aa31..3251668e155 100644 --- a/go/test/endtoend/vtgate/vindex_bindvars/main_test.go +++ b/go/test/endtoend/vtgate/vindex_bindvars/main_test.go @@ -25,8 +25,8 @@ import ( "vitess.io/vitess/go/test/endtoend/utils" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gotest.tools/assert" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/test/endtoend/cluster" diff --git a/go/vt/vtctl/vdiff2_test.go b/go/vt/vtctl/vdiff2_test.go index 1348cd06448..0e5b2f41c60 100644 --- a/go/vt/vtctl/vdiff2_test.go +++ b/go/vt/vtctl/vdiff2_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/uuid" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gotest.tools/assert" "vitess.io/vitess/go/sqltypes" tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata" diff --git a/go/vt/vtctl/workflow/log_recorder_test.go b/go/vt/vtctl/workflow/log_recorder_test.go index b58d1d42a79..0234e811771 100644 --- a/go/vt/vtctl/workflow/log_recorder_test.go +++ b/go/vt/vtctl/workflow/log_recorder_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLogRecorder(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/acl_test.go b/go/vt/vttablet/endtoend/acl_test.go index 0894c2838d0..ed9cfa83817 100644 --- a/go/vt/vttablet/endtoend/acl_test.go +++ b/go/vt/vttablet/endtoend/acl_test.go @@ -21,7 +21,7 @@ import ( "encoding/json" "testing" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/vttablet/endtoend/framework" diff --git a/go/vt/wrangler/log_recorder_test.go b/go/vt/wrangler/log_recorder_test.go index 5eaecdac702..852b80876a4 100644 --- a/go/vt/wrangler/log_recorder_test.go +++ b/go/vt/wrangler/log_recorder_test.go @@ -19,7 +19,7 @@ package wrangler import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLogRecorder(t *testing.T) {