weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Use log.Logf instead of GinkgoWriter

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-01-08 14:52:51 +00:00
parent 016ae6077f
commit 8533a5b91c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD.bazel
View File

@ -20,6 +20,7 @@ go_library(
deps = [
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon:go_default_library",
"//test/e2e/framework/log:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
],
)

8
test/e2e/e2e.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package e2e
import (
"fmt"
"io/ioutil"
"os"
"path"
@ -26,6 +25,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/log"
)
var (
@ -62,7 +62,7 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {},
var err error
globalLogs, err = addon.GlobalLogs()
if err != nil {
ginkgo.GinkgoWriter.Write([]byte("Failed to retrieve global addon logs: " + err.Error()))
log.Logf("Failed to retrieve global addon logs: " + err.Error())
}
for k, v := range globalLogs {
@ -70,13 +70,13 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {},
// Create a directory for the file if needed
err := os.MkdirAll(path.Dir(outPath), 0755)
if err != nil {
ginkgo.GinkgoWriter.Write([]byte(fmt.Sprintf("Failed to create directory for logs: %v", err)))
log.Logf("Failed to create directory for logs: %v", err)
continue
}
err = ioutil.WriteFile(outPath, []byte(v), 0644)
if err != nil {
ginkgo.GinkgoWriter.Write([]byte(fmt.Sprintf("Failed to write log file: %v", err)))
log.Logf("Failed to write log file: %v", err)
continue
}
}

5
test/e2e/framework/framework.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package framework
import (
"fmt"
"time"
. "github.com/onsi/ginkgo"
@ -36,6 +35,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/config"
"github.com/jetstack/cert-manager/test/e2e/framework/helper"
"github.com/jetstack/cert-manager/test/e2e/framework/log"
"github.com/jetstack/cert-manager/test/e2e/framework/util"
"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
)
@ -144,7 +144,8 @@ func (f *Framework) printAddonLogs() {
l, err := a.Logs()
Expect(err).NotTo(HaveOccurred())
GinkgoWriter.Write([]byte(fmt.Sprintf("Got pod logs for addon: \n%s", l)))
// TODO: replace with writing logs to a file
log.Logf("Got pod logs for addon: \n%s", l)
}
}
}