github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disk finder refactor

Browse Source 
Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
Katarzyna Treder 2024-12-11 09:04:46 +01:00
parent 8a5d531a32
commit e0f6d58d80
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test-framework

@ -1 +1 @@
Subproject commit 7512420e2adbecf2a83847f963f61326d17c77fc Subproject commit 6970a4310790fc56023661a5c7c1bddca714ceba

2
test/functional/tests/cli/test_zero_metadata_command.py
View File

@ -15,7 +15,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
from test_tools.disk_utils import get_device_filesystem_type, Filesystem from test_tools.disk_utils import get_device_filesystem_type, Filesystem
from test_tools.fio.fio import Fio from test_tools.fio.fio import Fio
from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.fio.fio_param import IoEngine, ReadWrite
from test_utils.disk_finder import get_system_disks from test_tools.disk_finder import get_system_disks
from connection.utils.output import CmdException from connection.utils.output import CmdException
from types.size import Size, Unit from types.size import Size, Unit

4
test/functional/tests/conftest.py
View File

@ -25,7 +25,6 @@ from storage_devices.raid import Raid
from storage_devices.ramdisk import RamDisk from storage_devices.ramdisk import RamDisk
from test_tools.os_tools import kill_all_io from test_tools.os_tools import kill_all_io
from test_tools.udev import Udev from test_tools.udev import Udev
from test_utils.disk_finder import get_disk_serial_number
from test_tools.disk_utils import PartitionTable, create_partition_table from test_tools.disk_utils import PartitionTable, create_partition_table
from test_tools.device_mapper import DeviceMapper from test_tools.device_mapper import DeviceMapper
from test_tools.mdadm import Mdadm from test_tools.mdadm import Mdadm
@ -34,6 +33,7 @@ from test_tools import initramfs, git
from log.logger import create_log, Log from log.logger import create_log, Log
from test_utils.common.singleton import Singleton from test_utils.common.singleton import Singleton
from storage_devices.lvm import Lvm, LvmConfiguration from storage_devices.lvm import Lvm, LvmConfiguration
from storage_devices.disk import Disk
def pytest_addoption(parser): def pytest_addoption(parser):
@ -185,7 +185,7 @@ def base_prepare(item):
RamDisk.remove_all() RamDisk.remove_all()
for disk in TestRun.disks.values(): for disk in TestRun.disks.values():
disk_serial = get_disk_serial_number(disk.path) disk_serial = Disk.get_disk_serial_number(disk.path)
if disk.serial_number and disk.serial_number != disk_serial: if disk.serial_number and disk.serial_number != disk_serial:
raise Exception( raise Exception(
f"Serial for {disk.path} doesn't match the one from the config." f"Serial for {disk.path} doesn't match the one from the config."