Skip to content

Commit

Permalink
tests/utils.go: remove Running function frrom utils.go
Browse files Browse the repository at this point in the history
Running is used only in tests/replicaset_test.go

Changes:
- Move it to where it is used as private function

- Rename it to make it clear that this function
is used for filtering.

Signed-off-by: bmordeha <bmordeha@redhat.com>
  • Loading branch information
Barakmor1 committed Apr 16, 2024
1 parent b766b06 commit c1c1fb6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
11 changes: 10 additions & 1 deletion tests/replicaset_test.go
Expand Up @@ -427,7 +427,7 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp
Eventually(func() int {
vmis, err := virtClient.VirtualMachineInstance(testsuite.GetTestNamespace(rs)).List(context.Background(), v12.ListOptions{})
Expect(err).ToNot(HaveOccurred())
return len(tests.Running(vmis))
return len(filterRunningVmis(vmis))
}, 40*time.Second, time.Second).Should(Equal(2))

vmi := &vmis.Items[0]
Expand Down Expand Up @@ -481,3 +481,12 @@ var _ = Describe("[rfe_id:588][crit:medium][vendor:cnv-qe@redhat.com][level:comp
Expect(resultFields[len(expectedHeader)]).To(Equal(newRS.Name))
})
})

func filterRunningVmis(vmis *v1.VirtualMachineInstanceList) (running []v1.VirtualMachineInstance) {
for _, vmi := range vmis.Items {
if vmi.DeletionTimestamp == nil && vmi.Status.Phase == v1.Running {
running = append(running, vmi)
}
}
return
}
9 changes: 0 additions & 9 deletions tests/utils.go
Expand Up @@ -569,15 +569,6 @@ func NotDeletedVMs(vms *v1.VirtualMachineList) (notDeleted []v1.VirtualMachine)
return
}

func Running(vmis *v1.VirtualMachineInstanceList) (running []v1.VirtualMachineInstance) {
for _, vmi := range vmis.Items {
if vmi.DeletionTimestamp == nil && vmi.Status.Phase == v1.Running {
running = append(running, vmi)
}
}
return
}

func UnfinishedVMIPodSelector(vmi *v1.VirtualMachineInstance) metav1.ListOptions {
virtClient := kubevirt.Client()

Expand Down

0 comments on commit c1c1fb6

Please sign in to comment.