From f2ea3140c6a4d1ca1245fff8fbebdc0212ad661f Mon Sep 17 00:00:00 2001 From: abdhumal Date: Tue, 30 Jan 2024 15:10:05 +0530 Subject: [PATCH] update --- .../appwrapper_reconciler_test.go | 20 ++++++++++++++----- go.mod | 3 +++ go.sum | 5 ++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/functional-tests/appwrapper_reconciler_test.go b/functional-tests/appwrapper_reconciler_test.go index 94124a0..f58004d 100644 --- a/functional-tests/appwrapper_reconciler_test.go +++ b/functional-tests/appwrapper_reconciler_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" gstruct "github.com/onsi/gomega/gstruct" machinev1beta1 "github.com/openshift/api/machine/v1beta1" @@ -26,6 +27,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) +var ( + ctx context.Context + cancel context.CancelFunc +) + func logger() { // Get log file path from environment variable or use a default path logFilePath := os.Getenv("LOG_FILE_PATH") @@ -50,6 +56,7 @@ func logger() { func startEnvTest(t *testing.T) *rest.Config { // to redirect all functional test related logs to separate logfile ~ default (in functional-tests directory), can be changed using environment variable LOG_FILE_PATH=/path_to_logfile logger() + ctx, cancel = context.WithCancel(context.TODO()) //specify testEnv configuration testEnv := &envtest.Environment{ @@ -62,9 +69,10 @@ func startEnvTest(t *testing.T) *rest.Config { test := WithConfig(t, testEnv.Config) cfg, err := testEnv.Start() test.Expect(err).NotTo(HaveOccurred()) + test.Expect(cfg).NotTo(BeNil()) t.Cleanup(func() { - teardownTestEnv(t, testEnv) + teardownTestEnv(test, testEnv) }) return cfg @@ -99,16 +107,18 @@ func startInstascaleController(test Test, cfg *rest.Config) { // Start the controller manager in a goroutine. go func() { + defer GinkgoRecover() err = k8sManager.Start(ctrl.SetupSignalHandler()) test.Expect(err).ToNot(HaveOccurred()) }() } -func teardownTestEnv(t *testing.T, testEnv *envtest.Environment) { - if err := testEnv.Stop(); err != nil { - t.Log("Error stopping test Environment\n", err) - } +func teardownTestEnv(test Test, testEnv *envtest.Environment) { + cancel() + By("tearing down the test environment") + err := testEnv.Stop() + test.Expect(err).NotTo(HaveOccurred()) } func instascaleAppwrapper(namespace string) *mcadv1beta1.AppWrapper { diff --git a/go.mod b/go.mod index 9b50a79..e3a7f6f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/project-codeflare/instascale go 1.19 require ( + github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.27.10 github.com/openshift-online/ocm-sdk-go v0.1.368 github.com/openshift/api v0.0.0-20230213134911-7ba313770556 @@ -50,6 +51,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/nxadm/tail v1.4.8 // indirect github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.15.1 // indirect @@ -71,6 +73,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.27.7 // indirect diff --git a/go.sum b/go.sum index 4ff8ce9..3ff215f 100644 --- a/go.sum +++ b/go.sum @@ -311,11 +311,13 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= @@ -778,6 +780,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -826,4 +829,4 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h6 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= \ No newline at end of file +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=