Merge pull request #319 from Nordix/e2e

Fix integration tests blocking the CI
Nordix · Nov 9, 2022 · 354dced · 354dced
2 parents 18bbf29 + 691fadc
commit 354dced
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/test/integration/attractor_test.go b/test/integration/attractor_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"fmt"

diff --git a/test/integration/conduit_test.go b/test/integration/conduit_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"time"

diff --git a/test/integration/e2e_suite_test.go b/test/integration/e2e_suite_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"context"
@@ -68,7 +68,7 @@ func init() {
 	flag.BoolVar(&mutating, "mutating", true, "specify the namespace for the tests to run")
 }
 
-var fw = NewFramework()
+var fw *Framework
 
 // default trench used in all tests
 func trench(namespace string) *meridiov1alpha1.Trench {
@@ -138,6 +138,7 @@ func TestE2E(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
+	fw = NewFramework()
 	deployment := fw.GetOperator()
 	Expect(deployment).ToNot(BeNil())
 	Expect(fw.OperatorPodRestarts()).To(Equal(int32(0)))

diff --git a/test/integration/flow_test.go b/test/integration/flow_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"time"

diff --git a/test/integration/gateway_test.go b/test/integration/gateway_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"fmt"

diff --git a/test/integration/stream_test.go b/test/integration/stream_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"time"

diff --git a/test/integration/trench_test.go b/test/integration/trench_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"fmt"

diff --git a/test/integration/vip_test.go b/test/integration/vip_test.go
@@ -1,4 +1,4 @@
-package e2e
+package integration_test
 
 import (
 	"fmt"