From 154d5b7322c2b9d0336836df7b0915be0b25c999 Mon Sep 17 00:00:00 2001 From: garfthoffman <109185460+garfthoffman@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:34:26 -0500 Subject: [PATCH] update test to use require instead of t.Fatal Signed-off-by: garfthoffman <109185460+garfthoffman@users.noreply.github.com> --- go/vt/tableacl/tableacl_test.go | 17 ++++++++--------- go/vt/vttablet/tabletserver/tabletserver.go | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go/vt/tableacl/tableacl_test.go b/go/vt/tableacl/tableacl_test.go index 1f5e89a6a48..16e5c5d6163 100644 --- a/go/vt/tableacl/tableacl_test.go +++ b/go/vt/tableacl/tableacl_test.go @@ -23,6 +23,7 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" "vitess.io/vitess/go/vt/tableacl/acl" @@ -77,16 +78,14 @@ func TestInitWithValidConfig(t *testing.T) { func TestInitWithEmptyConfig(t *testing.T) { tacl := tableACL{factory: &simpleacl.Factory{}} f, err := os.CreateTemp("", "tableacl") - if err != nil { - t.Fatal(err) - } + require.NoError(t, err) + defer os.Remove(f.Name()) - if err := f.Close(); err != nil { - t.Fatal(err) - } - if err := tacl.init(f.Name(), func() {}); err == nil { - t.Fatal("tableACL config file is empty") - } + err = f.Close() + require.NoError(t, err) + + err = tacl.init(f.Name(), func() {}) + require.Error(t, err) } func TestInitFromProto(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go index 484ce78c712..30f73d2d818 100644 --- a/go/vt/vttablet/tabletserver/tabletserver.go +++ b/go/vt/vttablet/tabletserver/tabletserver.go @@ -368,7 +368,6 @@ func (tsv *TabletServer) initACL(tableACLConfigFile string, enforceTableACLConfi tsv.ClearQueryPlanCache() }, ) - // Log failure if either there was a problem loading the ACL, or if the ACL is empty if err != nil { log.Errorf("Fail to initialize Table ACL: %v", err) if enforceTableACLConfig {