dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22282 from yuwata/test-revert-workaronds

Browse Source 
test: revert workaronds
This commit is contained in:
Frantisek Sumsal
2022-01-28 12:37:12 +00:00
committed by GitHub
parent 71df50a973 5ea91cf8f3
commit 6c66575f0b
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/units/testsuite-46.sh
View File

@@ -153,20 +153,13 @@ if ! systemd-detect-virt -cq ; then
inspect test-user2
fi
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- test ! -f /home/test-user/xyz
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz \
&& { echo 'unexpected success'; exit 1; }
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- touch /home/test-user/xyz
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- rm /home/test-user/xyz
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- test ! -f /home/test-user/xyz
wait_for_state test-user inactive
PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz \
&& { echo 'unexpected success'; exit 1; }

12
test/units/testsuite-64.sh
View File

@@ -390,10 +390,6 @@ testcase_btrfs_basic() {
uuid="deadbeef-dead-dead-beef-000000000000"
label="btrfs_root"
mkfs.btrfs -L "$label" -U "$uuid" "${devices[0]}"
# We need to do some active waiting anyway, as it may take kernel a bit
# to trigger the newly created btrfs
helper_wait_for_dev "/dev/disk/by-uuid/$uuid"
helper_wait_for_dev "/dev/disk/by-label/$label"
udevadm settle
btrfs filesystem show
test -e "/dev/disk/by-uuid/$uuid"
@@ -413,8 +409,6 @@ name="diskpart4", size=85M
EOF
udevadm settle
mkfs.btrfs -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4}
helper_wait_for_dev "/dev/disk/by-uuid/$uuid"
helper_wait_for_dev "/dev/disk/by-label/$label"
udevadm settle
btrfs filesystem show
test -e "/dev/disk/by-uuid/$uuid"
@@ -426,8 +420,6 @@ EOF
uuid="deadbeef-dead-dead-beef-000000000002"
label="btrfs_mdisk"
mkfs.btrfs -M -d raid10 -m raid10 -L "$label" -U "$uuid" "${devices[@]}"
helper_wait_for_dev "/dev/disk/by-uuid/$uuid"
helper_wait_for_dev "/dev/disk/by-label/$label"
udevadm settle
btrfs filesystem show
test -e "/dev/disk/by-uuid/$uuid"
@@ -465,8 +457,6 @@ EOF
ls -l /dev/mapper/encbtrfs{0..3}
# Create a multi-device btrfs filesystem on the LUKS devices
mkfs.btrfs -M -d raid1 -m raid1 -L "$label" -U "$uuid" /dev/mapper/encbtrfs{0..3}
helper_wait_for_dev "/dev/disk/by-uuid/$uuid"
helper_wait_for_dev "/dev/disk/by-label/$label"
udevadm settle
btrfs filesystem show
test -e "/dev/disk/by-uuid/$uuid"
@@ -493,8 +483,6 @@ EOF
# Start the corresponding mount unit and check if the btrfs device was reconstructed
# correctly
systemctl start "${mpoint##*/}.mount"
helper_wait_for_dev "/dev/disk/by-uuid/$uuid"
helper_wait_for_dev "/dev/disk/by-label/$label"
btrfs filesystem show
test -e "/dev/disk/by-uuid/$uuid"
test -e "/dev/disk/by-label/$label"