This is an automated email from the ASF dual-hosted git repository.
chenyulin0719 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 13f4b5ca [YUNIKORN-3054] Refactor persistent_volume E2E test suite
structure (#962)
13f4b5ca is described below
commit 13f4b5cac0f72aee2e1f1d4c451615dbec45e8d5
Author: YUN SUN <[email protected]>
AuthorDate: Mon Apr 7 14:16:45 2025 +0000
[YUNIKORN-3054] Refactor persistent_volume E2E test suite structure (#962)
Closes: #962
Signed-off-by: Yu-Lin Chen <[email protected]>
---
.../persistent_volume_suite_test.go | 26 +++++++++++++++++
.../persistent_volume/persistent_volume_test.go | 34 ++++------------------
2 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/test/e2e/persistent_volume/persistent_volume_suite_test.go
b/test/e2e/persistent_volume/persistent_volume_suite_test.go
index d82a4c61..24c65c94 100644
--- a/test/e2e/persistent_volume/persistent_volume_suite_test.go
+++ b/test/e2e/persistent_volume/persistent_volume_suite_test.go
@@ -20,6 +20,7 @@ package persistent_volume
import (
"path/filepath"
+ "runtime"
"testing"
"github.com/onsi/ginkgo/v2"
@@ -27,6 +28,9 @@ import (
"github.com/onsi/gomega"
"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"
)
func init() {
@@ -49,3 +53,25 @@ func TestPersistentVolume(t *testing.T) {
var Ω = gomega.Ω
var HaveOccurred = gomega.HaveOccurred
var dev string
+
+var _ = ginkgo.BeforeSuite(func() {
+ _, filename, _, _ := runtime.Caller(0)
+ suiteName = common.GetSuiteName(filename)
+ // Initializing kubectl client
+ kClient = k8s.KubeCtl{}
+ Ω(kClient.SetClient()).To(gomega.BeNil())
+
+ // Initializing rest client
+ restClient = yunikorn.RClient{}
+ Ω(restClient).NotTo(gomega.BeNil())
+ yunikorn.EnsureYuniKornConfigsPresent()
+})
+
+var _ = ginkgo.AfterSuite(func() {
+ // Clean up
+ ginkgo.By("Deleting PVCs and PVs")
+ err := kClient.DeletePVCs(dev)
+ err2 := kClient.DeletePVs(dev)
+ Ω(err).NotTo(HaveOccurred())
+ Ω(err2).NotTo(HaveOccurred())
+})
diff --git a/test/e2e/persistent_volume/persistent_volume_test.go
b/test/e2e/persistent_volume/persistent_volume_test.go
index 5a1c0073..0e305771 100644
--- a/test/e2e/persistent_volume/persistent_volume_test.go
+++ b/test/e2e/persistent_volume/persistent_volume_test.go
@@ -19,7 +19,6 @@
package persistent_volume
import (
- "runtime"
"time"
"github.com/onsi/ginkgo/v2"
@@ -53,18 +52,6 @@ const (
scName = "nfs-sc"
)
-var _ = ginkgo.BeforeSuite(func() {
- _, filename, _, _ := runtime.Caller(0)
- suiteName = common.GetSuiteName(filename)
- // Initializing kubectl client
- kClient = k8s.KubeCtl{}
- Ω(kClient.SetClient()).To(gomega.BeNil())
-
- // Initializing rest client
- restClient = yunikorn.RClient{}
- Ω(restClient).NotTo(gomega.BeNil())
- yunikorn.EnsureYuniKornConfigsPresent()
-})
var _ = ginkgo.BeforeEach(func() {
// Create namespace
dev = "dev-" + common.RandSeq(5)
@@ -78,15 +65,12 @@ var _ = ginkgo.AfterEach(func() {
ginkgo.By("Tearing down namespace: " + dev)
err := kClient.TearDownNamespace(dev)
Ω(err).NotTo(HaveOccurred())
-})
-var _ = ginkgo.AfterSuite(func() {
- // Clean up
- ginkgo.By("Deleting PVCs and PVs")
- err := kClient.DeletePVCs(dev)
- err2 := kClient.DeletePVs(dev)
- Ω(err).NotTo(HaveOccurred())
- Ω(err2).NotTo(HaveOccurred())
+ tests.DumpClusterInfoIfSpecFailed(suiteName, []string{"default"})
+
+ // Clean up nfs provisioner resources
+ deleteNfsRelatedRoles(saName, crName, crbName)
+ deleteNfsProvisioner(serverName, scName)
})
var _ = ginkgo.Describe("PersistentVolume", func() {
@@ -181,14 +165,6 @@ var _ = ginkgo.Describe("PersistentVolume", func() {
Ω(err).NotTo(HaveOccurred())
})
-
- ginkgo.AfterEach(func() {
- tests.DumpClusterInfoIfSpecFailed(suiteName,
[]string{"default"})
-
- // Clean up nfs provisioner resources
- deleteNfsRelatedRoles(saName, crName, crbName)
- deleteNfsProvisioner(serverName, scName)
- })
})
func createNfsRbac(svaName string, crName string, crbName string) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
