Skip to content

test: improve flaky usb reconnection test #2332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaroslavborbat wants to merge 1 commit into
base: main
Choose a base branch
from
+75 −10
Open

test: improve flaky usb reconnection test #2332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 75 additions & 10 deletions test/e2e/vm/usb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package vm
import (
"context"
"fmt"
"strings"
"time"

. "github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -91,7 +92,15 @@ var _ = Describe("VirtualMachineUSB", Label(precheck.PrecheckUSB), func() {
})

By("Mounting USB device", func() {
t.mountUSB()
GinkgoWriter.Println("Finding USB device")
mountDevice := t.findUSBMountDevice()
GinkgoWriter.Println("Found USB device:", mountDevice)

GinkgoWriter.Println("Formatting USB device")
t.formatUSBDevice(mountDevice)

GinkgoWriter.Println("Mounting USB device")
t.mountUSBDevice(mountDevice)
})

By("Writing data to USB device", func() {
Expand All @@ -115,7 +124,12 @@ var _ = Describe("VirtualMachineUSB", Label(precheck.PrecheckUSB), func() {
})

By("Remounting USB device after migration", func() {
t.mountUSB()
GinkgoWriter.Println("Finding USB device")
mountDevice := t.findUSBMountDevice()
GinkgoWriter.Println("Found USB device:", mountDevice)

GinkgoWriter.Println("Remounting USB device")
t.mountUSBDevice(mountDevice)
})

By("Verifying data persists after migration", func() {
Expand Down Expand Up @@ -183,6 +197,8 @@ func (t *VMUSBTest) GenerateEnvironmentResources() {
}
Expect(freeUSB).NotTo(BeNil(), "no free USB devices available")

GinkgoWriter.Println("Found free USB device:", freeUSB.Name)

t.NodeUSBDevice = freeUSB

usbNodeName := t.NodeUSBDevice.Status.NodeName
Expand Down Expand Up @@ -255,11 +271,11 @@ func (t *VMUSBTest) verifyUSBTestData() {
Expect(result).To(ContainSubstring(t.testContent))
}

func (t *VMUSBTest) mountUSB() {
func (t *VMUSBTest) findUSBMountDevice() string {
serial := t.NodeUSBDevice.Status.Attributes.Serial
Expect(serial).NotTo(BeEmpty(), "USB device serial must be set")

mountCmd := fmt.Sprintf(`
findDeviceCmd := fmt.Sprintf(`
usb_serial=%q
: > /tmp/usb-mount.err
for serial_file in /sys/bus/usb/devices/*/serial; do
Expand Down Expand Up @@ -293,20 +309,69 @@ func (t *VMUSBTest) mountUSB() {
exit 1
}

echo "$mount_device"
`, serial)

var mountDevice string

Eventually(func() error {
result, err := t.Framework.SSHCommand(
t.VM.Name,
t.VM.Namespace,
findDeviceCmd,
framework.WithSSHTimeout(framework.ShortTimeout),
)
if err != nil {
return err
}
mountDevice = strings.TrimSpace(result)
if mountDevice == "" {
return fmt.Errorf("empty mount device output")
}

return nil
}).WithTimeout(framework.MiddleTimeout).WithPolling(time.Second).Should(Succeed(), t.usbDiagnostics())

return mountDevice
}

func (t *VMUSBTest) formatUSBDevice(mountDevice string) {
formatCmd := fmt.Sprintf(`
: > /tmp/usb-mount.err
sudo mkfs.vfat -I %q 2>>/tmp/usb-mount.err
`, mountDevice)

Eventually(func() error {
_, err := t.Framework.SSHCommand(
t.VM.Name,
t.VM.Namespace,
formatCmd,
framework.WithSSHTimeout(framework.ShortTimeout),
)
return err
}).WithTimeout(framework.MiddleTimeout).WithPolling(time.Second).Should(Succeed(), t.usbDiagnostics())
}

func (t *VMUSBTest) mountUSBDevice(mountDevice string) {
mountCmd := fmt.Sprintf(`
: > /tmp/usb-mount.err
sudo mkdir -p /mnt/usb
if sudo mountpoint -q /mnt/usb; then
sudo umount /mnt/usb || true
fi
sudo mount -t auto "$mount_device" /mnt/usb 2>>/tmp/usb-mount.err || \
sudo mount -t vfat -o rw "$mount_device" /mnt/usb 2>>/tmp/usb-mount.err || \
sudo mount -o rw "$mount_device" /mnt/usb 2>>/tmp/usb-mount.err
sudo mount %q /mnt/usb 2>>/tmp/usb-mount.err
ls -la /mnt/usb
`, serial)
`, mountDevice)

Eventually(func() error {
_, err := t.Framework.SSHCommand(t.VM.Name, t.VM.Namespace, mountCmd, framework.WithSSHTimeout(framework.MiddleTimeout))
_, err := t.Framework.SSHCommand(
t.VM.Name,
t.VM.Namespace,
mountCmd,
framework.WithSSHTimeout(framework.MiddleTimeout),
)
return err
}).WithTimeout(framework.MiddleTimeout).WithPolling(time.Second).Should(Succeed(), t.usbDiagnostics())
}).WithTimeout(framework.LongTimeout).WithPolling(time.Second).Should(Succeed(), t.usbDiagnostics())
}

func (t *VMUSBTest) usbDiagnostics() string {
Expand Down
Loading