Merge branch 'main' into ca

canonical · Aug 27, 2024 · 644f33a · 644f33a
2 parents 9653788 + f4417ae
commit 644f33a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/gocert/main.go b/cmd/gocert/main.go
@@ -10,7 +10,7 @@ import (
 )
 
 func main() {
-	log.SetOutput(os.Stderr)
+	log.SetOutput(os.Stdout)
 	configFilePtr := flag.String("config", "", "The config file to be provided to the server")
 	flag.Parse()
 	if *configFilePtr == "" {

diff --git a/cmd/gocert/main_test.go b/cmd/gocert/main_test.go
@@ -151,13 +151,13 @@ func TestGoCertFail(t *testing.T) {
 		}
 		flag.CommandLine = flag.NewFlagSet(tc.Name, flag.ExitOnError)
 		cmd := exec.Command("gocert", tc.Args...)
-		stderr, _ := cmd.StderrPipe()
+		stdout, _ := cmd.StdoutPipe()
 
 		if err := cmd.Start(); err != nil {
 			t.Errorf("Failed running command")
 		}
 
-		slurp, _ := io.ReadAll(stderr)
+		slurp, _ := io.ReadAll(stdout)
 
 		if err := cmd.Wait(); err == nil {
 			t.Errorf("Command did not fail")