Fix Apply and test.Suit

Signed-off-by: pavel.larkin <[email protected]>
kanisterio · Feb 12, 2024 · 9850f4a · 9850f4a
1 parent 0f635ad
commit 9850f4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/kopia/cli/internal/flag/flag.go b/pkg/kopia/cli/internal/flag/flag.go
@@ -36,7 +36,7 @@ func Apply(cli safecli.CommandAppender, flags ...Applier) error {
 		if flag == nil { // if the flag is nil, skip it
 			continue
 		}
-		if err := flag.Apply(cli); err != nil {
+		if err := flag.Apply(sub); err != nil {
 			return err
 		}
 	}

diff --git a/pkg/kopia/cli/internal/test/flag_suite.go b/pkg/kopia/cli/internal/test/flag_suite.go
@@ -62,7 +62,9 @@ func (t *FlagTest) assertNoError(c *check.C, err error) {
 
 // assertCLI asserts the builder's CLI output against ExpectedCLI.
 func (t *FlagTest) assertCLI(c *check.C, b *safecli.Builder) {
-	c.Check(b.Build(), check.DeepEquals, t.ExpectedCLI, t)
+	if t.ExpectedCLI != nil {
+		c.Check(b.Build(), check.DeepEquals, t.ExpectedCLI, t)
+	}
 }
 
 // assertLog asserts the builder's log output against ExpectedLog.
@@ -74,11 +76,11 @@ func (t *FlagTest) assertLog(c *check.C, b *safecli.Builder) {
 // Test runs the flag test.
 func (ft *FlagTest) Test(c *check.C, b *safecli.Builder) {
 	err := flag.Apply(b, ft.Flag)
+	ft.assertCLI(c, b)
 	if ft.ExpectedErr != nil {
 		ft.assertError(c, err)
 	} else {
 		ft.assertNoError(c, err)
-		ft.assertCLI(c, b)
 		ft.assertLog(c, b)
 	}
 }