chore(test): fix some problems

- increase context timeout in the ipam test
- run complex-test in a single process
- run log streamer in a single instance
- ignore not found when deleting kustomized resources
- fix some typos

Signed-off-by: Roman Sysoev <[email protected]>

Author: Roman Sysoev

tests/e2e/affinity_toleration_test.go

@@ -463,7 +463,7 @@ var _ = Describe("Virtual machine affinity and toleration", ginkgoutil.CommonE2E
 
 	Context("When test is completed", func() {
 		It("deletes test case resources", func() {
-			DeleteTestCaseResources(ResourcesToDelete{KustomizationDir: conf.TestData.AffinityToleration})
+			DeleteTestCaseResources(ns, ResourcesToDelete{KustomizationDir: conf.TestData.AffinityToleration})
 		})
 	})
 })

tests/e2e/complex_test.go

@@ -30,7 +30,7 @@ import (
 	kc "github.com/deckhouse/virtualization/tests/e2e/kubectl"
 )
 
-var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
+var _ = Describe("ComplexTest", Serial, ginkgoutil.CommonE2ETestDecorators(), func() {
 	var (
 		testCaseLabel      = map[string]string{"testcase": "complex-test"}
 		hasNoConsumerLabel = map[string]string{"hasNoConsumer": "complex-test"}

tests/e2e/go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
 	github.com/onsi/ginkgo/v2 v2.21.0
 	github.com/onsi/gomega v1.35.1
+	golang.org/x/sync v0.8.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.32.3
 	k8s.io/apimachinery v0.32.3
@@ -64,7 +65,6 @@ require (
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/term v0.25.0 // indirect
 	golang.org/x/text v0.19.0 // indirect

tests/e2e/ipam_test.go

@@ -59,7 +59,7 @@ var _ = Describe("IPAM", ginkgoutil.CommonE2ETestDecorators(), func() {
 	})
 
 	BeforeEach(func() {
-		ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
+		ctx, cancel = context.WithTimeout(context.Background(), 50*time.Second)
 
 		vmip = &virtv2.VirtualMachineIPAddress{
 			ObjectMeta: metav1.ObjectMeta{

tests/e2e/tests_suite_test.go

@@ -171,20 +171,15 @@ func TestTests(t *testing.T) {
 	RegisterFailHandler(Fail)
 	fmt.Fprintf(GinkgoWriter, "Starting test suite\n")
 	RunSpecs(t, "Tests")
-
-	if (ginkgoutil.FailureBehaviourEnvSwitcher{}).IsStopOnFailure() || !config.IsCleanUpNeeded() {
-		return
-	}
 }
 
 var _ = SynchronizedBeforeSuite(func() {
-	// TODO: get kustomization files from testdata directory when all tests will be refactored
 	var kustomizationFiles []string
 	v := reflect.ValueOf(conf.TestData)
 	t := reflect.TypeOf(conf.TestData)
 
 	if v.Kind() == reflect.Struct {
-		for i := 0; i < v.NumField(); i++ {
+		for i := range v.NumField() {
 			field := v.Field(i)
 			fieldType := t.Field(i)
 
@@ -216,11 +211,11 @@ var _ = SynchronizedBeforeSuite(func() {
 	} else {
 		log.Println("Run test in REUSABLE mode")
 	}
-}, func() {
-	// StartV12nControllerLogStream(logStreamByV12nControllerPod)
-})
 
-var _ = SynchronizedAfterSuite(func() {
+	StartV12nControllerLogStream(logStreamByV12nControllerPod)
+}, func() {})
+
+var _ = SynchronizedAfterSuite(func() {}, func() {
 	errs := make([]error, 0)
 	checkErrs := CheckV12nControllerRestarts(logStreamByV12nControllerPod)
 	if len(checkErrs) != 0 {
@@ -231,7 +226,11 @@ var _ = SynchronizedAfterSuite(func() {
 		errs = append(errs, stopErrs...)
 	}
 	Expect(errs).Should(BeEmpty())
-}, func() {
+
+	if (ginkgoutil.FailureBehaviourEnvSwitcher{}).IsStopOnFailure() || !config.IsCleanUpNeeded() {
+		return
+	}
+
 	err := Cleanup()
 	if err != nil {
 		log.Fatal(err)
@@ -241,7 +240,11 @@ var _ = SynchronizedAfterSuite(func() {
 func Cleanup() error {
 	var eg errgroup.Group
 
-	eg.Go(deleteProject)
+	err := deleteProject()
+	if err != nil {
+		return err
+	}
+
 	eg.Go(deleteNamespaces)
 	eg.Go(deleteResources)
 

tests/e2e/util_test.go

@@ -551,6 +551,7 @@ func DeleteTestCaseResources(ns string, resources ResourcesToDelete) {
 			res := kubectl.Delete(kc.DeleteOptions{
 				Filename:       []string{resources.KustomizationDir},
 				FilenameOption: kc.Kustomize,
+				IgnoreNotFound: true,
 			})
 			Expect(res.Error()).NotTo(HaveOccurred(), fmt.Sprintf("%s\nkustomizationDir: %s\ncmd: %s\nstderr: %s", errMessage, resources.KustomizationDir, res.GetCmd(), res.StdErr()))
 		}

tests/e2e/vd_snapshots_test.go

@@ -46,7 +46,7 @@ const (
 var _ = Describe("VirtualDiskSnapshots", ginkgoutil.CommonE2ETestDecorators(), func() {
 	var (
 		defaultVolumeSnapshotClassName string
-		testCaseLabel                  = map[string]string{"testcase": "vd-snapshots"}
+		testCaseLabel                  = map[string]string{"testcase": "vd-snapshots", "id": namePrefix}
 		attachedVirtualDiskLabel       = map[string]string{"attachedVirtualDisk": ""}
 		hasNoConsumerLabel             = map[string]string{"hasNoConsumer": "vd-snapshots"}
 		vmAutomaticWithHotplug         = map[string]string{"vm": "automatic-with-hotplug"}

tests/e2e/vm_connectivity_test.go

@@ -41,7 +41,7 @@ const (
 	nginxActiveStatus = "active"
 )
 
-var _ = Describe(fmt.Sprintf("VirtualMachineConnectivity %d", GinkgoParallelProcess()), ginkgoutil.CommonE2ETestDecorators(), func() {
+var _ = Describe("VirtualMachineConnectivity", ginkgoutil.CommonE2ETestDecorators(), func() {
 	var (
 		testCaseLabel = map[string]string{"testcase": "vm-connectivity"}
 		aObjName      = fmt.Sprintf("%s-vm-connectivity-a", namePrefix)

tests/e2e/vm_version_test.go

@@ -94,13 +94,13 @@ var _ = Describe("VirtualMachineVersions", ginkgoutil.CommonE2ETestDecorators(),
 			})
 			Expect(err).NotTo(HaveOccurred())
 
-			It("has qemu version is status", func() {
+			It("has qemu version in the status", func() {
 				for _, vm := range vms.Items {
 					Expect(vm.Status.Versions.Qemu).NotTo(BeEmpty())
 				}
 			})
 
-			It("has libvirt version is status", func() {
+			It("has libvirt version in the status", func() {
 				for _, vm := range vms.Items {
 					Expect(vm.Status.Versions.Libvirt).NotTo(BeEmpty())
 				}