From 2f18c092106e4854e032f88fcb7e4dad7a11b447 Mon Sep 17 00:00:00 2001 From: Enrique Llorente Pastora Date: Mon, 30 Nov 2020 16:54:38 +0100 Subject: [PATCH] Activate k8s reporter for handler e2e test (#647) The kubernetes e2e test reporter was activated for operator tests but not for handler. Signed-off-by: Quique Llorente --- test/e2e/handler/main_test.go | 4 ++-- test/reporter/reporter.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/e2e/handler/main_test.go b/test/e2e/handler/main_test.go index 910215f974..69f7e6445e 100644 --- a/test/e2e/handler/main_test.go +++ b/test/e2e/handler/main_test.go @@ -15,7 +15,7 @@ import ( corev1 "k8s.io/api/core/v1" - //knmstatereporter "github.com/nmstate/kubernetes-nmstate/test/reporter" + knmstatereporter "github.com/nmstate/kubernetes-nmstate/test/reporter" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -68,7 +68,7 @@ func TestE2E(t *testing.T) { RegisterFailHandler(Fail) reporters := make([]Reporter, 0) - //reporters = append(reporters, knmstatereporter.New("test_logs/e2e/handler", testenv.OperatorNamespace, nodes)) + reporters = append(reporters, knmstatereporter.New("test_logs/e2e/handler", testenv.OperatorNamespace, nodes)) if ginkgoreporters.Polarion.Run { reporters = append(reporters, &ginkgoreporters.Polarion) } diff --git a/test/reporter/reporter.go b/test/reporter/reporter.go index d9cff0dc5b..7a7f518dd7 100644 --- a/test/reporter/reporter.go +++ b/test/reporter/reporter.go @@ -110,6 +110,14 @@ func (r *KubernetesNMStateReporter) logDeviceStatus(testName string) { func (r *KubernetesNMStateReporter) Cleanup() { // clean up artifacts from previous run if r.artifactsDir != "" { + _, err := os.Stat(r.artifactsDir) + if err != nil { + if os.IsNotExist(err) { + return + } else { + panic(err) + } + } names, err := ioutil.ReadDir(r.artifactsDir) if err != nil { panic(err)