From ca2686a8439cf32a8fcbe812d3776f55c23f18ce Mon Sep 17 00:00:00 2001 From: Dan Kenigsberg Date: Thu, 17 Feb 2022 08:44:57 +0200 Subject: [PATCH] container_disk_test: reuse libvmi.New* and RunVMIAndExpectLaunch Using these functions makes the tests slightly shorter and clearer. Simple replacement did not work in some of the tests, e.g test_id:1463, did not work right away. I don't understand those tests and their peculiar usage of objs on top of vmis so I leave their cleanup to a future PR. Signed-off-by: Dan Kenigsberg --- tests/container_disk_test.go | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/tests/container_disk_test.go b/tests/container_disk_test.go index 56c4dab3a024..2a953ce54283 100644 --- a/tests/container_disk_test.go +++ b/tests/container_disk_test.go @@ -125,7 +125,7 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp Describe("[rfe_id:273][crit:medium][vendor:cnv-qe@redhat.com][level:component]Starting a VirtualMachineInstance", func() { Context("with ephemeral registry disk", func() { It("[test_id:1464]should not modify the spec on status update", func() { - vmi := tests.NewRandomVMIWithEphemeralDiskAndUserdata(cd.ContainerDiskFor(cd.ContainerDiskCirros), "#!/bin/bash\necho 'hello'\n") + vmi := libvmi.NewCirros() v1.SetObjectDefaults_VirtualMachineInstance(vmi) By("Starting the VirtualMachineInstance") @@ -151,7 +151,7 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp Expect(err).To(BeNil()) By("Starting the VirtualMachineInstance") - vmi := tests.NewRandomVMIWithEphemeralDisk(cd.ContainerDiskFor(cd.ContainerDiskCirros)) + vmi := libvmi.NewCirros() _, err = virtClient.VirtualMachineInstance(util.NamespaceTestDefault).Create(vmi) Expect(err).To(BeNil()) By("Checking that the VMI failed") @@ -201,9 +201,7 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp } } By("Starting the VirtualMachineInstance") - obj, err := virtClient.RestClient().Post().Resource("virtualmachineinstances").Namespace(util.NamespaceTestDefault).Body(vmi).Do(context.Background()).Get() - Expect(err).To(BeNil()) - tests.WaitForSuccessfulVMIStart(obj) + vmi = tests.RunVMIAndExpectLaunch(vmi, 60) }) }) @@ -212,13 +210,9 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp Describe("[rfe_id:273][crit:medium][vendor:cnv-qe@redhat.com][level:component]Starting with virtio-win", func() { Context("with virtio-win as secondary disk", func() { It("[test_id:1467]should boot and have the virtio as sata CDROM", func() { - vmi := tests.NewRandomVMIWithEphemeralDisk(cd.ContainerDiskFor(cd.ContainerDiskAlpine)) + vmi := libvmi.NewAlpine() tests.AddEphemeralCdrom(vmi, "disk4", "sata", cd.ContainerDiskFor(cd.ContainerDiskVirtio)) - - By("Starting the VirtualMachineInstance") - obj, err := virtClient.RestClient().Post().Resource("virtualmachineinstances").Namespace(util.NamespaceTestDefault).Body(vmi).Do(context.Background()).Get() - Expect(err).To(BeNil(), "expected vmi to start with no problem") - tests.WaitForSuccessfulVMIStart(obj) + vmi = tests.RunVMIAndExpectLaunch(vmi, 60) By("Checking whether the second disk really contains virtio drivers") Expect(console.LoginToAlpine(vmi)).To(Succeed(), "expected alpine to login properly") @@ -243,12 +237,8 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp Describe("[rfe_id:4052][crit:high][arm64][vendor:cnv-qe@redhat.com][level:component]VMI disk permissions", func() { Context("with ephemeral registry disk", func() { It("[test_id:4299]should not have world write permissions", func() { - vmi := tests.NewRandomVMIWithEphemeralDisk(cd.ContainerDiskFor(cd.ContainerDiskAlpine)) - - By("Starting a New VMI") - vmi, err = virtClient.VirtualMachineInstance(util.NamespaceTestDefault).Create(vmi) - Expect(err).ToNot(HaveOccurred()) - tests.WaitForSuccessfulVMIStart(vmi) + vmi := libvmi.NewAlpine() + vmi = tests.RunVMIAndExpectLaunch(vmi, 60) By("Ensuring VMI is running by logging in") tests.WaitUntilVMIReady(vmi, console.LoginToAlpine)