Adding upstream version 252.26.upstream/252.26upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 7 insertions, 6 deletions

diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh
index c5f9bcc..35c4f1c 100755
--- a/test/units/testsuite-38.sh
+++ b/test/units/testsuite-38.sh
@@ -91,7 +91,7 @@ check_freezer_state() {
 
         # Ignore the intermediate freezing & thawing states in case we check
         # the unit state too quickly
-        [[ "$state" =~ ^(freezing|thawing)$ ]] || break
+        [[ "$state" =~ ^(freezing|thawing) ]] || break
         sleep .5
     done
 
diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
index ec80b71..e41ca4c 100755
--- a/test/units/testsuite-46.sh
+++ b/test/units/testsuite-46.sh
@@ -20,7 +20,7 @@ inspect() {
     userdbctl user "$USERNAME" | tee /tmp/b
 
     # diff uses the grep BREs for pattern matching
-    diff -I '^\s*Disk \(Size\|Free\|Floor\|Ceiling\):' /tmp/{a,b}
+    diff -I '^\s*Disk \(Size\|Free\|Floor\|Ceiling\|Usage\):' /tmp/{a,b}
     rm /tmp/{a,b}
 
     homectl inspect --json=pretty "$USERNAME"
diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
index e369e58..5b72a49 100755
--- a/test/units/testsuite-58.sh
+++ b/test/units/testsuite-58.sh
@@ -283,7 +283,7 @@ $imgs/zzz6 : start=     4194264, size=     2097152, type=0FC63DAF-8483-4772-8E79
 $imgs/zzz7 : start=     6291416, size=       98304, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=7B93D1F2-595D-4CE3-B0B9-837FBD9E63B0, name=\"luks-format-copy\""
 
     loop="$(losetup -P --show --find "$imgs/zzz")"
-    udevadm wait --timeout 60 --settle "${loop:?}"
+    udevadm wait --timeout 60 --settle "${loop:?}p7"
 
     volume="test-repart-$RANDOM"
 
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index e9f352c..f0cfce3 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -577,9 +577,10 @@ EOF
     for ((i = 0; i < ${#devices[@]}; i++)); do
         # Intentionally use weaker cipher-related settings, since we don't care
         # about security here as it's a throwaway LUKS partition
-        cryptsetup luksFormat -q \
-            --use-urandom --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \
-            --uuid "deadbeef-dead-dead-beef-11111111111$i" --label "encdisk$i" "${devices[$i]}" /etc/btrfs_keyfile
+        udevadm lock --device="${devices[$i]}" \
+                cryptsetup luksFormat -q \
+                --use-urandom --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \
+                --uuid "deadbeef-dead-dead-beef-11111111111$i" --label "encdisk$i" "${devices[$i]}" /etc/btrfs_keyfile
         udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/deadbeef-dead-dead-beef-11111111111$i" "/dev/disk/by-label/encdisk$i"
         # Add the device into /etc/crypttab, reload systemd, and then activate
         # the device so we can create a filesystem on it later