From 9acaccf13fd3f754f2125462e6b7fd8616ef0b1d Mon Sep 17 00:00:00 2001 From: Karolina Rogowska Date: Thu, 18 Aug 2022 13:27:06 +0200 Subject: [PATCH] fix tests - proper io class config path Signed-off-by: Karolina Rogowska --- .../tests/io_class/test_io_class_occupancy.py | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/test/functional/tests/io_class/test_io_class_occupancy.py b/test/functional/tests/io_class/test_io_class_occupancy.py index c5cbd79..4ad043d 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -1,24 +1,25 @@ # -# Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2020-2022 Intel Corporation # SPDX-License-Identifier: BSD-3-Clause # -import pytest - from collections import namedtuple from math import isclose -from api.cas.statistics import IoClassUsageStats + +import pytest + from api.cas import ioclass_config, casadm -from core.test_run import TestRun -from test_utils.size import Unit, Size -from tests.io_class.io_class_common import prepare, mountpoint, run_io_dir, \ - get_io_class_occupancy, ioclass_config_path, run_io_dir_read, get_io_class_usage from api.cas.cache_config import CacheMode, CacheLineSize -from api.cas.ioclass_config import IoClass +from api.cas.ioclass_config import IoClass, default_config_file_path +from api.cas.statistics import IoClassUsageStats +from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_utils.os_utils import sync, Udev +from test_utils.size import Unit, Size +from tests.io_class.io_class_common import prepare, mountpoint, run_io_dir, \ + get_io_class_occupancy, run_io_dir_read, get_io_class_usage @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @@ -77,7 +78,7 @@ def test_ioclass_occupancy_directory_write(io_size_multiplication, cache_mode, c f"{io_class.max_occupancy:0.2f}", ) - casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) + casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path) with TestRun.step("Reset cache stats"): cache.purge_cache() @@ -213,7 +214,7 @@ def test_ioclass_occupancy_directory_read(io_size_multiplication, cache_line_siz f"{io_class.max_occupancy:0.2f}", ) - casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) + casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path) with TestRun.step("Reset cache stats"): cache.purge_cache() @@ -335,7 +336,7 @@ def test_ioclass_occupancy_sum_cache(): f"{io_class.max_occupancy:0.2f}", ) - casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) + casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path) with TestRun.step("Purge cache"): cache.purge_cache()