cmd/wit-bindgen-go: silence test

Author: ydnar

cmd/wit-bindgen-go/cmd/generate/generate.go

@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/urfave/cli/v3"
 	"go.bytecodealliance.org/internal/codec"
 	"go.bytecodealliance.org/internal/go/gen"
 	"go.bytecodealliance.org/internal/witcli"
 	"go.bytecodealliance.org/wit/bindgen"
 	"go.bytecodealliance.org/wit/logging"
-	"github.com/urfave/cli/v3"
 )
 
 // Command is the CLI command for wit.
@@ -80,7 +80,7 @@ type config struct {
 }
 
 func action(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := parseFlags(cmd)
+	cfg, err := parseFlags(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -102,10 +102,10 @@ func action(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	return writeGoPackages(packages, cfg)
+	return writeGoPackages(ctx, cmd, cfg, packages)
 }
 
-func parseFlags(cmd *cli.Command) (*config, error) {
+func parseFlags(_ context.Context, cmd *cli.Command) (*config, error) {
 	logger := witcli.Logger(cmd.Bool("verbose"), cmd.Bool("debug"))
 	dryRun := cmd.Bool("dry-run")
 	out := cmd.String("out")
@@ -145,7 +145,7 @@ func parseFlags(cmd *cli.Command) (*config, error) {
 	}, nil
 }
 
-func writeGoPackages(packages []*gen.Package, cfg *config) error {
+func writeGoPackages(_ context.Context, cmd *cli.Command, cfg *config, packages []*gen.Package) error {
 	cfg.logger.Infof("Generated %d Go package(s)\n", len(packages))
 	for _, pkg := range packages {
 		if !pkg.HasContent() {
@@ -179,8 +179,8 @@ func writeGoPackages(packages []*gen.Package, cfg *config) error {
 			}
 
 			if cfg.dryRun {
-				fmt.Println(string(content))
-				fmt.Println()
+				fmt.Fprintln(cmd.Writer, string(content))
+				fmt.Fprintln(cmd.Writer)
 				continue
 			}
 

cmd/wit-bindgen-go/main.go

@@ -64,7 +64,7 @@ var version = &cli.Command{
 	Name:  "version",
 	Usage: "print the version",
 	Action: func(ctx context.Context, cmd *cli.Command) error {
-		fmt.Printf("%s version %s\n", cmd.Root().Name, witcli.Version())
+		fmt.Fprintf(cmd.Writer, "%s version %s\n", cmd.Root().Name, witcli.Version())
 		return nil
 	},
 }

cmd/wit-bindgen-go/main_test.go

@@ -3,14 +3,18 @@ package main
 import (
 	"bytes"
 	"context"
+	"strings"
 	"testing"
 )
 
 // TestSimpleGenVerbosity ensures that a basic generation case honors the verbose flag
 func TestSimpleGenVerbosity(t *testing.T) {
+	inWIT := `package tests:test;`
+	stdin := strings.NewReader(inWIT)
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer
 	cmd := Command
+	cmd.Reader = stdin
 	cmd.Writer = &stdout
 	cmd.ErrWriter = &stderr
 
@@ -20,7 +24,7 @@ func TestSimpleGenVerbosity(t *testing.T) {
 		"--world",
 		"http-fetch-simple",
 		"--dry-run",
-		"../../testdata/codegen/simple-http.wit",
+		"-",
 	}
 
 	// Run the app without verbose
@@ -29,6 +33,7 @@ func TestSimpleGenVerbosity(t *testing.T) {
 		t.Errorf("output was written to stderr despite lack of --verbose")
 	}
 
+	stdin.Reset(inWIT)
 	stdout.Reset()
 	stderr.Reset()