From 4fcf69bc5287f6ca6090655ef8b8bb8087d6fa8a Mon Sep 17 00:00:00 2001
From: Arash Deshmeh <adeshmeh@ca.ibm.com>
Date: Fri, 16 Feb 2018 16:30:42 -0500
Subject: [PATCH] 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>
---
pkg/releasetesting/environment_test.go | 8 ++++----
pkg/releasetesting/test_suite_test.go | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkg/releasetesting/environment_test.go b/pkg/releasetesting/environment_test.go
index 29ca93d09..0199b74eb 100644
--- a/pkg/releasetesting/environment_test.go
+++ b/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},
}
}
diff --git a/pkg/releasetesting/test_suite_test.go b/pkg/releasetesting/test_suite_test.go
index d83cd2666..e6cc8bcf5 100644
--- a/pkg/releasetesting/test_suite_test.go
+++ b/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},
}
}
--
GitLab