Merge pull request #3527 from adshmh/fix-output-leak-from-realsetesting-test-suite

Fix the output leak to stdout during build by tests under pkg/releasetesting

pkg/releasetesting/environment_test.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"os"
+	"io/ioutil"
 	"testing"
 
 	"k8s.io/helm/pkg/proto/hapi/release"
@@ -145,7 +145,7 @@ type getFailingKubeClient struct {
 
 func newGetFailingKubeClient() *getFailingKubeClient {
 	return &getFailingKubeClient{
-		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: os.Stdout},
+		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: ioutil.Discard},
 	}
 }
 
@@ -159,7 +159,7 @@ type deleteFailingKubeClient struct {
 
 func newDeleteFailingKubeClient() *deleteFailingKubeClient {
 	return &deleteFailingKubeClient{
-		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: os.Stdout},
+		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: ioutil.Discard},
 	}
 }
 
@@ -173,7 +173,7 @@ type createFailingKubeClient struct {
 
 func newCreateFailingKubeClient() *createFailingKubeClient {
 	return &createFailingKubeClient{
-		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: os.Stdout},
+		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: ioutil.Discard},
 	}
 }
 

pkg/releasetesting/test_suite_test.go

@@ -18,7 +18,7 @@ package releasetesting
 
 import (
 	"io"
-	"os"
+	"io/ioutil"
 	"testing"
 	"time"
 
@@ -320,7 +320,7 @@ type podSucceededKubeClient struct {
 
 func newPodSucceededKubeClient() *podSucceededKubeClient {
 	return &podSucceededKubeClient{
-		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: os.Stdout},
+		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: ioutil.Discard},
 	}
 }
 
@@ -334,7 +334,7 @@ type podFailedKubeClient struct {
 
 func newPodFailedKubeClient() *podFailedKubeClient {
 	return &podFailedKubeClient{
-		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: os.Stdout},
+		PrintingKubeClient: tillerEnv.PrintingKubeClient{Out: ioutil.Discard},
 	}
 }