From f59fc28ef2ea25f9c60ec3311681f93548d812db Mon Sep 17 00:00:00 2001 From: Kamil Gierszewski Date: Wed, 30 Oct 2024 00:53:14 +0100 Subject: [PATCH] test-framework: Wait for raids after creating, not while discovering Signed-off-by: Kamil Gierszewski --- test_tools/mdadm.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test_tools/mdadm.py b/test_tools/mdadm.py index ae962bb..db5e60a 100644 --- a/test_tools/mdadm.py +++ b/test_tools/mdadm.py @@ -1,11 +1,14 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # + import re from core.test_run import TestRun from test_utils.size import Unit +from test_utils.os_utils import Udev class Mdadm: @@ -33,7 +36,11 @@ class Mdadm: if conf.size: cmd += f"--size={int(conf.size.get_value(Unit.KibiByte))} " cmd += device_paths - return TestRun.executor.run_expect_success(cmd) + ret = TestRun.executor.run_expect_success(cmd) + Udev.trigger() + Udev.settle() + + return ret @staticmethod def detail(raid_device_paths: str): @@ -76,8 +83,6 @@ class Mdadm: raids = [] uuid_path_prefix = "/dev/disk/by-id/md-uuid-" - # sometimes links for RAIDs are not properly created, force udev to create them - TestRun.executor.run("udevadm trigger && udevadm settle") for line in output.stdout.splitlines(): split_line = line.split()