This is an automated email from the ASF dual-hosted git repository.
wilfred-s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new b9341401 [YUNIKORN-3301] Sort the imports for e2e tests (#1048)
b9341401 is described below
commit b93414013dbc4f339b55c39208689417e1208fef
Author: mhasnain <[email protected]>
AuthorDate: Wed Jul 1 10:20:32 2026 +1000
[YUNIKORN-3301] Sort the imports for e2e tests (#1048)
Fix the import ordering in the e2e test code, ordering and grouping
following the standard YuniKorn rules.
Closes: #1048
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
test/e2e/basic_scheduling/basic_scheduling_suite_test.go | 3 +--
test/e2e/framework/helpers/common/test_queues_configs.go | 4 ++--
test/e2e/framework/helpers/k8s/k8s_utils.go | 7 +++----
test/e2e/framework/helpers/k8s/pv_conf.go | 3 +--
test/e2e/framework/helpers/yunikorn/wrappers.go | 9 +++------
test/e2e/queue_quota_mgmt/queue_quota_mgmt_suite_test.go | 6 ++----
test/e2e/simple_preemptor/simple_preemptor_suite_test.go | 5 ++---
test/e2e/simple_preemptor/simple_preemptor_test.go | 12 +++++-------
8 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
b/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
index a0245c40..6d900559 100644
--- a/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
+++ b/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
@@ -23,9 +23,8 @@ import (
"runtime"
"testing"
- "github.com/onsi/ginkgo/v2/reporters"
-
"github.com/onsi/ginkgo/v2"
+ "github.com/onsi/ginkgo/v2/reporters"
"github.com/onsi/gomega"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/configmanager"
diff --git a/test/e2e/framework/helpers/common/test_queues_configs.go
b/test/e2e/framework/helpers/common/test_queues_configs.go
index f449a3a3..1d251d6e 100644
--- a/test/e2e/framework/helpers/common/test_queues_configs.go
+++ b/test/e2e/framework/helpers/common/test_queues_configs.go
@@ -24,9 +24,9 @@ import (
"strings"
"time"
- "github.com/apache/yunikorn-core/pkg/common/configs"
-
"go.yaml.in/yaml/v3"
+
+ "github.com/apache/yunikorn-core/pkg/common/configs"
)
// Converts partitionsWrapper to YAML string
diff --git a/test/e2e/framework/helpers/k8s/k8s_utils.go
b/test/e2e/framework/helpers/k8s/k8s_utils.go
index 5c24d813..c8f5fd6b 100644
--- a/test/e2e/framework/helpers/k8s/k8s_utils.go
+++ b/test/e2e/framework/helpers/k8s/k8s_utils.go
@@ -31,10 +31,6 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
- clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
- "k8s.io/client-go/transport/spdy"
- "k8s.io/streaming/pkg/httpstream"
-
"go.uber.org/zap"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
@@ -53,10 +49,13 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/clientcmd"
+ clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/client-go/tools/portforward"
+ "k8s.io/client-go/transport/spdy"
"k8s.io/client-go/util/retry"
helper "k8s.io/component-helpers/resource"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
+ "k8s.io/streaming/pkg/httpstream"
"github.com/apache/yunikorn-k8shim/pkg/common/constants"
"github.com/apache/yunikorn-k8shim/pkg/common/utils"
diff --git a/test/e2e/framework/helpers/k8s/pv_conf.go
b/test/e2e/framework/helpers/k8s/pv_conf.go
index 26114761..fca4dee2 100644
--- a/test/e2e/framework/helpers/k8s/pv_conf.go
+++ b/test/e2e/framework/helpers/k8s/pv_conf.go
@@ -19,9 +19,8 @@ package k8s
import (
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
"k8s.io/apimachinery/pkg/api/resource"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
type PvConfig struct {
diff --git a/test/e2e/framework/helpers/yunikorn/wrappers.go
b/test/e2e/framework/helpers/yunikorn/wrappers.go
index 567509d3..28e6083a 100644
--- a/test/e2e/framework/helpers/yunikorn/wrappers.go
+++ b/test/e2e/framework/helpers/yunikorn/wrappers.go
@@ -21,19 +21,16 @@ package yunikorn
import (
"time"
+ "github.com/onsi/ginkgo/v2"
+ "github.com/onsi/gomega"
"go.yaml.in/yaml/v3"
v1 "k8s.io/api/core/v1"
- "github.com/apache/yunikorn-k8shim/pkg/common/constants"
-
"github.com/apache/yunikorn-core/pkg/common/configs"
-
+ "github.com/apache/yunikorn-k8shim/pkg/common/constants"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/configmanager"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
-
- "github.com/onsi/ginkgo/v2"
- "github.com/onsi/gomega"
)
var k = k8s.KubeCtl{}
diff --git a/test/e2e/queue_quota_mgmt/queue_quota_mgmt_suite_test.go
b/test/e2e/queue_quota_mgmt/queue_quota_mgmt_suite_test.go
index 4d9bf886..cac89aa3 100644
--- a/test/e2e/queue_quota_mgmt/queue_quota_mgmt_suite_test.go
+++ b/test/e2e/queue_quota_mgmt/queue_quota_mgmt_suite_test.go
@@ -23,12 +23,10 @@ import (
"runtime"
"testing"
- v1 "k8s.io/api/core/v1"
-
- "github.com/onsi/ginkgo/v2/reporters"
-
"github.com/onsi/ginkgo/v2"
+ "github.com/onsi/ginkgo/v2/reporters"
"github.com/onsi/gomega"
+ v1 "k8s.io/api/core/v1"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/configmanager"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
diff --git a/test/e2e/simple_preemptor/simple_preemptor_suite_test.go
b/test/e2e/simple_preemptor/simple_preemptor_suite_test.go
index 660e0cf1..4d0137bd 100644
--- a/test/e2e/simple_preemptor/simple_preemptor_suite_test.go
+++ b/test/e2e/simple_preemptor/simple_preemptor_suite_test.go
@@ -27,14 +27,13 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/ginkgo/v2/reporters"
"github.com/onsi/gomega"
+ v1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/api/resource"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/configmanager"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/yunikorn"
-
- v1 "k8s.io/api/core/v1"
- "k8s.io/apimachinery/pkg/api/resource"
)
func init() {
diff --git a/test/e2e/simple_preemptor/simple_preemptor_test.go
b/test/e2e/simple_preemptor/simple_preemptor_test.go
index 5613eccb..cc66c31f 100644
--- a/test/e2e/simple_preemptor/simple_preemptor_test.go
+++ b/test/e2e/simple_preemptor/simple_preemptor_test.go
@@ -22,17 +22,15 @@ import (
"fmt"
"time"
- tests "github.com/apache/yunikorn-k8shim/test/e2e"
-
- "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
- "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
- "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/yunikorn"
-
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
-
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
+
+ tests "github.com/apache/yunikorn-k8shim/test/e2e"
+ "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
+ "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
+ "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/yunikorn"
)
var suiteName string
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
