Unverified Commit 1a9e0f0d authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub

Merge pull request #3535 from adshmh/fix-output-leak-from-pkg-tiller-tests

fix the output leak from test code under pkg/tiller
parents 642ad5c1 5b25eef9
......@@ -19,6 +19,7 @@ package tiller
import (
"errors"
"io"
"io/ioutil"
"os"
"regexp"
"testing"
......@@ -284,7 +285,7 @@ func releaseWithKeepStub(rlsName string) *release.Release {
func MockEnvironment() *environment.Environment {
e := environment.New()
e.Releases = storage.Init(driver.NewMemory())
e.KubeClient = &environment.PrintingKubeClient{Out: os.Stdout}
e.KubeClient = &environment.PrintingKubeClient{Out: ioutil.Discard}
return e
}
......@@ -305,7 +306,7 @@ func (u *updateFailingKubeClient) Update(namespace string, originalReader, modif
func newHookFailingKubeClient() *hookFailingKubeClient {
return &hookFailingKubeClient{
PrintingKubeClient: environment.PrintingKubeClient{Out: os.Stdout},
PrintingKubeClient: environment.PrintingKubeClient{Out: ioutil.Discard},
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment