test: remove extra argument from check calls (#2728)

* test: remove extra argument from check calls * Use released version of safecli
kanisterio · Mar 7, 2024 · f27ff46 · f27ff46
1 parent 0d7d70f
commit f27ff46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -214,7 +214,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-require github.com/kanisterio/safecli v0.0.6
+require github.com/kanisterio/safecli v0.0.7
 
 require (
 	github.com/Azure/go-autorest/autorest v0.11.27 // indirect

diff --git a/go.sum b/go.sum
@@ -356,8 +356,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/kanisterio/safecli v0.0.6 h1:Mq99jK7A/SBiHKZalUIlsk4qaSVZJNbBWb8rjaJv/Jk=
-github.com/kanisterio/safecli v0.0.6/go.mod h1:KBraqj8mdv2cwAr9wecknGUb8jztTzUik0r7uE6yRA8=
+github.com/kanisterio/safecli v0.0.7 h1:PsSbAs6MPox5h4zA9HT/dn5Qi5BtSVFq9c0Oh2sfRwE=
+github.com/kanisterio/safecli v0.0.7/go.mod h1:KBraqj8mdv2cwAr9wecknGUb8jztTzUik0r7uE6yRA8=
 github.com/kastenhq/check v0.0.0-20180626002341-0264cfcea734 h1:qulsCaCv+O2y9/sQ9nd5KChnAgFOWakTHQ9ZADjs6DQ=
 github.com/kastenhq/check v0.0.0-20180626002341-0264cfcea734/go.mod h1:rdqSnvOJuKCPFW/h2rVLuXOAkRnHHdp9PZcKx4HCoDM=
 github.com/kastenhq/stow v0.2.6-kasten.1.0.20231101232131-9321daa23aae h1:2cl4yuAJpdmLCx7G8eIsfNlQBLEfw0JDj6mTTyqc5qg=

diff --git a/pkg/kopia/cli/internal/test/command_suite.go b/pkg/kopia/cli/internal/test/command_suite.go
@@ -57,32 +57,35 @@ func (t *CommandTest) setDefaultExpectedLog() {
 
 // assertNoError makes sure there is no error.
 func (t *CommandTest) assertNoError(c *check.C, err error) {
-	c.Assert(err, check.IsNil, t)
+	c.Assert(err, check.IsNil)
 }
 
 // assertError checks the error against ExpectedErr.
 func (t *CommandTest) assertError(c *check.C, err error) {
 	actualErr := errors.Cause(err)
-	c.Assert(actualErr, check.Equals, t.ExpectedErr, t)
+	c.Assert(actualErr, check.Equals, t.ExpectedErr)
 }
 
 // assertCLI asserts the builder's CLI output against ExpectedCLI.
 func (t *CommandTest) assertCLI(c *check.C, b *safecli.Builder) {
 	if t.ExpectedCLI != nil {
-		c.Check(b.Build(), check.DeepEquals, t.ExpectedCLI, t)
+		c.Check(b.Build(), check.DeepEquals, t.ExpectedCLI)
 	}
 }
 
 // assertLog asserts the builder's log output against ExpectedLog.
 func (t *CommandTest) assertLog(c *check.C, b *safecli.Builder) {
 	if t.ExpectedCLI != nil {
 		t.setDefaultExpectedLog()
-		c.Check(b.String(), check.Equals, t.ExpectedLog, t)
+		c.Check(b.String(), check.Equals, t.ExpectedLog)
 	}
 }
 
 func (t *CommandTest) Test(c *check.C) {
 	cmd, err := t.Command()
+	if t.Name != "" {
+		c.Log(t.Name)
+	}
 	if t.ExpectedErr == nil {
 		t.assertNoError(c, err)
 	} else {