mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 10:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

TEST-64-UDEV-STORAGE: Don't hardcode device name in long-sysfs-path test

Browse Source 
There's no guarantee our device will be named /dev/vda, so give it
a serial so we can query for its devname inside the test.
This commit is contained in:
Daan De Meyer 2024-11-01 21:27:52 +01:00
parent 29a8e71d9c
commit 2ec809dd3b
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure
View File

@ -26,6 +26,6 @@ for bridge in range(1, 26):
f"pci-bridge,id=pci_bridge{bridge},bus=pci_bridge{bridge - 1},chassis_nr={64 + bridge},addr=1", f"pci-bridge,id=pci_bridge{bridge},bus=pci_bridge{bridge - 1},chassis_nr={64 + bridge},addr=1",
] ]
config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,bus=pci_bridge25,addr=1"] config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,bus=pci_bridge25,addr=1,serial=long-sysfs-path"]
json.dump(config, sys.stdout) json.dump(config, sys.stdout)

2
test/TEST-64-UDEV-STORAGE/test.sh
View File

@ -464,7 +464,7 @@ testcase_long_sysfs_path() {
qemu_opts+=("-device pci-bridge,id=pci_bridge$brid,bus=pci_bridge$((brid-1)),chassis_nr=$((64+brid))") qemu_opts+=("-device pci-bridge,id=pci_bridge$brid,bus=pci_bridge$((brid-1)),chassis_nr=$((64+brid))")
done done
qemu_opts+=("-device virtio-blk-pci,drive=drive0,bus=pci_bridge$brid") qemu_opts+=("-device virtio-blk-pci,drive=drive0,bus=pci_bridge$brid,serial=long-sysfs-path")
KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}" KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}"
QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}" QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}"

24
test/units/TEST-64-UDEV-STORAGE.sh
View File

@ -1006,19 +1006,21 @@ testcase_long_sysfs_path() {
journalctl --cursor-file="${cursor:?}" -n0 -q journalctl --cursor-file="${cursor:?}" -n0 -q
# Make sure the test device is connected and show its "wonderful" path # Make sure the test device is connected and show its "wonderful" path
stat /sys/block/vda dev="$(udevadm info -e --property-match=ID_SERIAL=long-sysfs-path --property-match DEVTYPE=disk --json=short | jq -r .DEVNAME)"
readlink -f /sys/block/vda/dev dev="${dev#/dev/}"
dev="/dev/vda" stat "/sys/block/${dev}"
udevadm lock --device "$dev" sfdisk "$dev" <<EOF readlink -f "/sys/block/${dev}/dev"
udevadm lock --device "/dev/${dev}" sfdisk "/dev/${dev}" <<EOF
label: gpt label: gpt
name="test_swap", size=32M name="test_swap", size=32M
uuid="deadbeef-dead-dead-beef-000000000000", name="test_part", size=5M uuid="deadbeef-dead-dead-beef-000000000000", name="test_part", size=5M
EOF EOF
udevadm settle udevadm settle
udevadm lock --device "${dev}1" mkswap -U "deadbeef-dead-dead-beef-111111111111" -L "swap_vol" "${dev}1" udevadm lock --device "/dev/${dev}1" mkswap -U "deadbeef-dead-dead-beef-111111111111" -L "swap_vol" "/dev/${dev}1"
udevadm lock --device "${dev}2" mkfs.ext4 -U "deadbeef-dead-dead-beef-222222222222" -L "data_vol" "${dev}2" udevadm lock --device "/dev/${dev}2" mkfs.ext4 -U "deadbeef-dead-dead-beef-222222222222" -L "data_vol" "/dev/${dev}2"
udevadm wait --settle --timeout=30 "${expected_symlinks[@]}" udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
# Try to mount the data partition manually (using its label) # Try to mount the data partition manually (using its label)
@ -1044,13 +1046,13 @@ EOF
# Check state of affairs after https://github.com/systemd/systemd/pull/22759 # Check state of affairs after https://github.com/systemd/systemd/pull/22759
# Note: can't use `--cursor-file` here, since we don't want to update the cursor # Note: can't use `--cursor-file` here, since we don't want to update the cursor
# after using it # after using it
[[ "$(journalctl --after-cursor="$(<"$cursor")" -q --no-pager -o short-monotonic -p info --grep "Device path.*vda.?' too long to fit into unit name" | wc -l)" -eq 0 ]] [[ "$(journalctl --after-cursor="$(<"$cursor")" -q --no-pager -o short-monotonic -p info --grep "Device path.*${dev}.?' too long to fit into unit name" | wc -l)" -eq 0 ]]
[[ "$(journalctl --after-cursor="$(<"$cursor")" -q --no-pager -o short-monotonic --grep "Unit name .*vda.?\.device\" too long, falling back to hashed unit name" | wc -l)" -gt 0 ]] [[ "$(journalctl --after-cursor="$(<"$cursor")" -q --no-pager -o short-monotonic --grep "Unit name .*${dev}.?\.device\" too long, falling back to hashed unit name" | wc -l)" -gt 0 ]]
# Check if the respective "hashed" units exist and are active (plugged) # Check if the respective "hashed" units exist and are active (plugged)
systemctl status --no-pager "$(readlink -f /sys/block/vda/vda1)" systemctl status --no-pager "$(readlink -f "/sys/block/${dev}/${dev}1")"
systemctl status --no-pager "$(readlink -f /sys/block/vda/vda2)" systemctl status --no-pager "$(readlink -f "/sys/block/${dev}/${dev}2")"
# Make sure we don't unnecessarily spam the log # Make sure we don't unnecessarily spam the log
{ journalctl -b -q --no-pager -o short-monotonic -p info --grep "/sys/devices/.+/vda[0-9]?" _PID=1 + UNIT=systemd-udevd.service || :;} | tee "$logfile" { journalctl -b -q --no-pager -o short-monotonic -p info --grep "/sys/devices/.+/${dev}[0-9]?" _PID=1 + UNIT=systemd-udevd.service || :;} | tee "$logfile"
[[ "$(wc -l <"$logfile")" -lt 10 ]] [[ "$(wc -l <"$logfile")" -lt 10 ]]
: >/etc/fstab : >/etc/fstab