Skip to content

Commit 5b1cf21

Browse files
fix
1 parent 4d0276f commit 5b1cf21

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • test/e2e/internal/util

test/e2e/internal/util/vm.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/apimachinery/pkg/util/wait"
35+
"k8s.io/utils/ptr"
3536
virtv1 "kubevirt.io/api/core/v1"
3637
"sigs.k8s.io/controller-runtime/pkg/client"
3738

@@ -132,7 +133,7 @@ func WaitUntilConditionOrSkipKnownVDMigrationControllerRevert(timeout time.Durat
132133
ctx, cancel := context.WithTimeout(context.Background(), timeout)
133134
defer cancel()
134135

135-
err := wait.PollUntilContextTimeout(ctx, time.Second, timeout, true, func(context.Context) (bool, error) {
136+
err := wait.PollUntilContextCancel(ctx, time.Second, true, func(context.Context) (bool, error) {
136137
lastErr = condition()
137138
return lastErr == nil, nil
138139
})
@@ -148,7 +149,7 @@ func WaitUntilConditionOrSkipKnownVDMigrationControllerRevert(timeout time.Durat
148149
Fail(fmt.Sprintf("timed out waiting for condition: %v", lastErr))
149150
}
150151

151-
Expect(err).NotTo(HaveOccurred())
152+
Fail(fmt.Sprintf("unexpected poll error without condition failure: %v", err))
152153
}
153154

154155
func SkipIfKnownVDMigrationControllerRevertOnTimeout(namespace string, since time.Time) {
@@ -190,6 +191,7 @@ func findKnownVDMigrationControllerRevertLog(namespace string, since time.Time)
190191
stream, err := framework.GetClients().KubeClient().CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{
191192
Container: controller.VirtualizationController,
192193
SinceTime: &sinceTime,
194+
TailLines: ptr.To(int64(5000)),
193195
}).Stream(ctx)
194196
if err != nil {
195197
GinkgoWriter.Printf("Failed to read virtualization-controller logs from pod %s: %v\n", pod.Name, err)

0 commit comments

Comments
 (0)