Skip to content

Commit d84e6de

Browse files
tmshorttmshort
committed
🌱 Remove ginkgo from e2e tests
Signed-off-by: Todd Short <[email protected]>
1 parent d02bca5 commit d84e6de

File tree

7 files changed

+404
-402
lines changed

7 files changed

+404
-402
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.
105105
.PHONY: e2e
106106
FOCUS := $(if $(TEST),-v -focus "$(TEST)")
107107
E2E_FLAGS ?= ""
108-
e2e: $(GINKGO) #EXHELP Run the e2e tests.
109-
$(GINKGO) --tags $(GO_BUILD_TAGS) $(E2E_FLAGS) -trace -progress $(FOCUS) test/e2e
108+
e2e: $(SETUP_ENVTEST) #EXHELP Run the e2e tests.
109+
eval $$($(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION)) && go test -tags $(GO_BUILD_TAGS) -v $(shell go list ./test/e2e)
110110

111111
export REG_PKG_NAME=registry-operator
112112
export PLAIN_PKG_NAME=plain-operator
113113
export CATALOG_IMG=${E2E_REGISTRY_NAME}.${E2E_REGISTRY_NAMESPACE}.svc:5000/test-catalog:e2e
114114
.PHONY: test-op-dev-e2e
115-
test-op-dev-e2e: $(GINKGO) $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run operator create, upgrade and delete tests.
115+
test-op-dev-e2e: $(SETUP_ENVTEST) $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run operator create, upgrade and delete tests.
116116
test/operator-framework-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) $(KIND) $(KIND_CLUSTER_NAME) ${E2E_REGISTRY_NAMESPACE}
117-
$(GINKGO) --tags $(GO_BUILD_TAGS) -trace -progress $(FOCUS) test/operator-framework-e2e
117+
eval $$($(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION)) && go test -tags $(GO_BUILD_TAGS) -v $(shell go list ./test/operator-framework-e2e)
118118

119119
.PHONY: test-unit
120120
ENVTEST_VERSION = $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')

‎go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ require (
77
github.com/blang/semver/v4 v4.0.0
88
github.com/go-logr/logr v1.3.0
99
github.com/google/go-cmp v0.6.0
10-
github.com/onsi/ginkgo/v2 v2.13.1
11-
github.com/onsi/gomega v1.30.0
1210
github.com/operator-framework/catalogd v0.10.0
1311
github.com/operator-framework/deppy v0.1.0
1412
github.com/operator-framework/operator-registry v1.32.0
@@ -64,15 +62,13 @@ require (
6462
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6563
github.com/go-openapi/jsonreference v0.20.2 // indirect
6664
github.com/go-openapi/swag v0.22.3 // indirect
67-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6865
github.com/gogo/protobuf v1.3.2 // indirect
6966
github.com/golang-migrate/migrate/v4 v4.16.1 // indirect
7067
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7168
github.com/golang/protobuf v1.5.3 // indirect
7269
github.com/google/cel-go v0.15.3 // indirect
7370
github.com/google/gnostic v0.6.9 // indirect
7471
github.com/google/gofuzz v1.2.0 // indirect
75-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7672
github.com/google/uuid v1.3.0 // indirect
7773
github.com/gorilla/mux v1.8.0 // indirect
7874
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
@@ -94,6 +90,7 @@ require (
9490
github.com/modern-go/reflect2 v1.0.2 // indirect
9591
github.com/morikuni/aec v1.0.0 // indirect
9692
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93+
github.com/onsi/gomega v1.30.0 // indirect
9794
github.com/opencontainers/go-digest v1.0.0 // indirect
9895
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
9996
github.com/operator-framework/api v0.19.0 // indirect

‎go.sum

+1-4
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/
393393
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
394394
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
395395
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
396-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
397396
github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
398397
github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
399398
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@@ -483,7 +482,6 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
483482
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
484483
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
485484
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
486-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
487485
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
488486
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
489487
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -528,7 +526,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
528526
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
529527
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
530528
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
531-
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
532529
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
533530
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
534531
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -651,8 +648,8 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
651648
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
652649
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
653650
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
651+
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
654652
github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
655-
github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
656653
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
657654
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
658655
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

‎test/e2e/e2e_suite_test.go

+11-31
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ package e2e
22

33
import (
44
"context"
5+
"os"
56
"testing"
6-
"time"
77

8-
. "github.com/onsi/ginkgo/v2"
9-
. "github.com/onsi/gomega"
108
appsv1 "k8s.io/api/apps/v1"
119
corev1 "k8s.io/api/core/v1"
12-
"k8s.io/utils/env"
1310

1411
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1512
"k8s.io/apimachinery/pkg/runtime"
13+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1614
"k8s.io/client-go/rest"
1715
ctrl "sigs.k8s.io/controller-runtime"
1816
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -33,41 +31,23 @@ const (
3331
testCatalogName = "test-catalog"
3432
)
3533

36-
func TestE2E(t *testing.T) {
37-
RegisterFailHandler(Fail)
38-
SetDefaultEventuallyTimeout(1 * time.Minute)
39-
SetDefaultEventuallyPollingInterval(1 * time.Second)
40-
RunSpecs(t, "E2E Suite")
41-
}
42-
43-
var _ = BeforeSuite(func() {
34+
func TestMain(m *testing.M) {
4435
cfg = ctrl.GetConfigOrDie()
4536

4637
scheme := runtime.NewScheme()
4738

48-
Expect(operatorv1alpha1.AddToScheme(scheme)).To(Succeed())
49-
Expect(rukpakv1alpha1.AddToScheme(scheme)).To(Succeed())
50-
Expect(catalogd.AddToScheme(scheme)).To(Succeed())
39+
utilruntime.Must(operatorv1alpha1.AddToScheme(scheme))
40+
utilruntime.Must(rukpakv1alpha1.AddToScheme(scheme))
41+
utilruntime.Must(catalogd.AddToScheme(scheme))
42+
utilruntime.Must(appsv1.AddToScheme(scheme))
43+
utilruntime.Must(corev1.AddToScheme(scheme))
5144

5245
var err error
53-
54-
err = appsv1.AddToScheme(scheme)
55-
Expect(err).ToNot(HaveOccurred())
56-
57-
err = corev1.AddToScheme(scheme)
58-
Expect(err).ToNot(HaveOccurred())
59-
6046
c, err = client.New(cfg, client.Options{Scheme: scheme})
61-
Expect(err).To(Not(HaveOccurred()))
62-
})
47+
utilruntime.Must(err)
6348

64-
var _ = AfterSuite(func() {
65-
ctx := context.Background()
66-
if basePath := env.GetString("ARTIFACT_PATH", ""); basePath != "" {
67-
// get all the artifacts from the test run and save them to the artifact path
68-
getArtifactsOutput(ctx, basePath)
69-
}
70-
})
49+
os.Exit(m.Run())
50+
}
7151

7252
// createTestCatalog will create a new catalog on the test cluster, provided
7353
// the context, catalog name, and the image reference. It returns the created catalog

0 commit comments

Comments
 (0)