From 8ec089f1b4c7f88b8142070fc0c125e841c9cfe6 Mon Sep 17 00:00:00 2001 From: vrbagalkot Date: Mon, 3 Mar 2025 14:34:32 +0530 Subject: [PATCH] [v2] Enhanced blktest Incorporated review comments Signed-off-by: vrbagalkot --- fs/blktests.py | 5 +++-- fs/blktests.py.data/blktests.yaml | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fs/blktests.py b/fs/blktests.py index 05be20313..be14ddb74 100644 --- a/fs/blktests.py +++ b/fs/blktests.py @@ -35,6 +35,7 @@ def setUp(self): ''' self.disk = self.params.get('disk', default='') self.dev_type = self.params.get('type', default='') + self.disk = self.disk.split(' ') smm = SoftwareManager() dist = distro.detect() if dist.name in ['Ubuntu', 'debian']: @@ -63,8 +64,8 @@ def test(self): os.chdir(self.sourcedir) genio.write_one_line("/proc/sys/kernel/hung_task_timeout_secs", "0") - if self.disk: - os.environ['TEST_DEVS'] = self.disk + for disk in self.disk: + os.environ['TEST_DEVS'] = ' '.join(self.disk) cmd = './check %s' % self.dev_type result = process.run(cmd, ignore_status=True, verbose=True) if result.exit_status != 0: diff --git a/fs/blktests.py.data/blktests.yaml b/fs/blktests.py.data/blktests.yaml index 82ddc4b07..ac2e07b7a 100644 --- a/fs/blktests.py.data/blktests.yaml +++ b/fs/blktests.py.data/blktests.yaml @@ -1,2 +1,12 @@ -disk: "null" -type: "null" +disk: "" +component: !mux + block: + type: "block" + scsi: + type" "scsi" + nvme: + type: "nvme" + loop: + type: "loop" + dm: + type: "dm"