Skip to content

Commit 8e1b8d7

Browse files
author
Mengqi Yu
committed
🏃 improve v2 e2e tests logging
Add warning prefix to the non-critical error logs, e.g. error during cleanup. We always run cleanup code no matter if the test succeed or fail. So cleanup may return errors, when early steps fail.
1 parent 2eebf56 commit 8e1b8d7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

test/e2e/test_context.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
. "github.com/onsi/ginkgo"
2727
)
2828

29-
const certmanagerVersion = "v0.8.1"
29+
const certmanagerVersion = "v0.10.1"
3030

3131
// KBTestContext specified to run e2e tests
3232
type KBTestContext struct {
@@ -97,10 +97,10 @@ func (kc *KBTestContext) InstallCertManager() error {
9797
// UninstallCertManager uninstalls the cert manager bundle.
9898
func (kc *KBTestContext) UninstallCertManager() {
9999
if _, err := kc.Kubectl.Delete(false, "-f", fmt.Sprintf("https://github.com/jetstack/cert-manager/releases/download/%s/cert-manager.yaml", certmanagerVersion)); err != nil {
100-
fmt.Fprintf(GinkgoWriter, "error when running kubectl delete during cleaning up cert manager: %v\n", err)
100+
fmt.Fprintf(GinkgoWriter, "warning: error when running kubectl delete during cleaning up cert manager: %v\n", err)
101101
}
102102
if _, err := kc.Kubectl.Delete(false, "namespace", "cert-manager"); err != nil {
103-
fmt.Fprintf(GinkgoWriter, "error when cleaning up the cert manager namespace: %v\n", err)
103+
fmt.Fprintf(GinkgoWriter, "warning: error when cleaning up the cert manager namespace: %v\n", err)
104104
}
105105
}
106106

@@ -109,10 +109,10 @@ func (kc *KBTestContext) CleanupManifests(dir string) {
109109
cmd := exec.Command("kustomize", "build", dir)
110110
output, err := kc.Run(cmd)
111111
if err != nil {
112-
fmt.Fprintf(GinkgoWriter, "error when running kustomize build: %v\n", err)
112+
fmt.Fprintf(GinkgoWriter, "warning: error when running kustomize build: %v\n", err)
113113
}
114114
if _, err := kc.Kubectl.CommandWithInput(string(output), "delete", "-f", "-"); err != nil {
115-
fmt.Fprintf(GinkgoWriter, "error when running kubectl delete -f -: %v\n", err)
115+
fmt.Fprintf(GinkgoWriter, "warning: error when running kubectl delete -f -: %v\n", err)
116116
}
117117
}
118118

@@ -151,10 +151,10 @@ func (kc *KBTestContext) Make(makeOptions ...string) error {
151151
func (kc *KBTestContext) Destroy() {
152152
cmd := exec.Command("docker", "rmi", "-f", kc.ImageName)
153153
if _, err := kc.Run(cmd); err != nil {
154-
fmt.Fprintf(GinkgoWriter, "error when removing the local image: %v\n", err)
154+
fmt.Fprintf(GinkgoWriter, "warning: error when removing the local image: %v\n", err)
155155
}
156156
if err := os.RemoveAll(kc.Dir); err != nil {
157-
fmt.Fprintf(GinkgoWriter, "error when removing the word dir: %v\n", err)
157+
fmt.Fprintf(GinkgoWriter, "warning: error when removing the word dir: %v\n", err)
158158
}
159159
}
160160

0 commit comments

Comments
 (0)