From 5a22b27b5c5ba5bef9afe06060bd16164b7082eb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 11 Oct 2024 03:37:01 +0900 Subject: [PATCH] TEST-17-UDEV: also check if /run/udev/links.lock/ is empty on settle --- test/units/TEST-17-UDEV.diskseq.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/units/TEST-17-UDEV.diskseq.sh b/test/units/TEST-17-UDEV.diskseq.sh index 1aafbe9834c..53ee666984f 100755 --- a/test/units/TEST-17-UDEV.diskseq.sh +++ b/test/units/TEST-17-UDEV.diskseq.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later # shellcheck disable=SC2010 +# shellcheck disable=SC2012 # shellcheck disable=SC2317 set -ex set -o pipefail @@ -43,6 +44,11 @@ systemctl daemon-reload udevadm settle +# Check if no lock file exists, if the lock directory exists. +if [[ -d /run/udev/links.lock/ ]]; then + [[ "$(ls /run/udev/links.lock/ | wc -l)" == 0 ]] +fi + # Save the current number of the directories. NUM_DISKSEQ=$(ls /run/udev/links/ | grep -c by-diskseq || :) @@ -54,4 +60,12 @@ for _ in {0..100}; do (( n <= NUM_DISKSEQ + 1 )) done +systemctl stop test-diskseq.service || : + +udevadm settle + +# Check if the lock directory exists, but no lock file exists in it. +[[ -d /run/udev/links.lock/ ]] +[[ "$(ls /run/udev/links.lock/ | wc -l)" == 0 ]] + exit 0 -- 2.47.3