sort imports for envoy_shutdown and setup suite for merge-gateways

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

test/e2e/merge-gateways/merge_gateways_test.go → test/e2e/merge_gateways/merge_gateways_test.go

@@ -6,7 +6,7 @@
 //go:build e2e
 // +build e2e
 
-package e2e
+package merge_gateways
 
 import (
 	"flag"
@@ -18,7 +18,6 @@ import (
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 	"sigs.k8s.io/gateway-api/conformance/utils/flags"
-	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	"sigs.k8s.io/gateway-api/conformance/utils/suite"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
@@ -51,16 +50,11 @@ func TestMergeGateways(t *testing.T) {
 		GatewayClassName:     *flags.GatewayClassName,
 		Debug:                *flags.ShowDebug,
 		CleanupBaseResources: *flags.CleanupBaseResources,
+		FS:                   &e2e.Manifests,
 		RunTest:              *flags.RunTest,
 	})
 
-	// Setting up the necessary arguments for the suite instead of calling Suite.Setup method again,
-	// since this test suite reuse the base resources of previous test suite.
-	cSuite.Applier.FS = e2e.Manifests
-	cSuite.Applier.GatewayClass = *flags.GatewayClassName
-	cSuite.ControllerName = kubernetes.GWCMustHaveAcceptedConditionTrue(t,
-		cSuite.Client, cSuite.TimeoutConfig, cSuite.GatewayClassName)
-
+	cSuite.Setup(t)
 	t.Logf("Running %d MergeGateways tests", len(tests.MergeGatewaysTests))
 	cSuite.Run(t, tests.MergeGatewaysTests)
 }

test/e2e/tests/envoy_shutdown.go

@@ -16,25 +16,22 @@ import (
 	"testing"
 	"time"
 
-	"github.com/envoyproxy/gateway/api/v1alpha1"
-
 	"fortio.org/fortio/periodic"
-
-	"github.com/envoyproxy/gateway/internal/gatewayapi"
-	"github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy"
-
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
-
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/gateway-api/conformance/utils/config"
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+
+	"github.com/envoyproxy/gateway/api/v1alpha1"
+	"github.com/envoyproxy/gateway/internal/gatewayapi"
+	"github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy"
 )
 
 func init() {