dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-04 15:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix the output leak to stdout during build by tests under pkg/releasetesting
This commit is contained in:
Matthew Fisher
2018-02-27 18:23:34 +00:00
committed by GitHub
parent de678ca51e 4fcf69bc52
commit 9c4fd1abae
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/releasetesting/environment_test.go
View File

@@ -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},
}
}

6
pkg/releasetesting/test_suite_test.go
View File

@@ -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},
}
}