fix(helm): fix the output leak to stdout during build by tests under pkg/releasetesting,

by redirecting output from mock clients.

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
pull/3527/head
Arash Deshmeh 7 years ago
parent a77f38da91
commit 4fcf69bc52

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

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

Loading…
Cancel
Save