Use parametrizex in tests
Signed-off-by: Jan Musial <jan.musial@intel.com>
This commit is contained in:
@@ -27,11 +27,11 @@ from api.cas.cache_config import (
|
||||
from test_tools.blktrace import BlkTrace, BlkTraceMask, ActionKind, RwbsKind
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@pytest.mark.parametrizex(
|
||||
"cache_line_size",
|
||||
[CacheLineSize.LINE_4KiB, CacheLineSize.LINE_16KiB, CacheLineSize.LINE_64KiB],
|
||||
)
|
||||
@pytest.mark.parametrize(
|
||||
@pytest.mark.parametrizex(
|
||||
"cache_mode", CacheMode.with_any_trait(CacheModeTrait.LazyWrites)
|
||||
)
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@@ -125,11 +125,11 @@ def test_acp_param_flush_max_buffers(cache_line_size, cache_mode):
|
||||
casadm.stop_all_caches()
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@pytest.mark.parametrizex(
|
||||
"cache_line_size",
|
||||
[CacheLineSize.LINE_4KiB, CacheLineSize.LINE_16KiB, CacheLineSize.LINE_64KiB],
|
||||
)
|
||||
@pytest.mark.parametrize(
|
||||
@pytest.mark.parametrizex(
|
||||
"cache_mode", CacheMode.with_any_trait(CacheModeTrait.LazyWrites)
|
||||
)
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
|
@@ -21,7 +21,7 @@ from test_utils.size import Size, Unit
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
def test_acp_functional(cache_mode):
|
||||
"""
|
||||
title: Validate ACP behavior.
|
||||
|
@@ -29,10 +29,10 @@ other_pattern = "0x0000"
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrize("cleaning_policy", CleaningPolicy)
|
||||
@pytest.mark.parametrize("cache_line_size", CacheLineSize)
|
||||
@pytest.mark.parametrize("filesystem", Filesystem)
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cleaning_policy", CleaningPolicy)
|
||||
@pytest.mark.parametrizex("cache_line_size", CacheLineSize)
|
||||
@pytest.mark.parametrizex("filesystem", Filesystem)
|
||||
@pytest.mark.require_plugin("power_control")
|
||||
def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, filesystem):
|
||||
"""
|
||||
|
@@ -24,7 +24,7 @@ test_file_size = Size(1.5, Unit.GibiByte)
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_plugin("power_control")
|
||||
def test_recovery_flush_reset_raw(cache_mode):
|
||||
"""
|
||||
@@ -103,8 +103,8 @@ def test_recovery_flush_reset_raw(cache_mode):
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrize("fs", [Filesystem.xfs, Filesystem.ext4])
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("fs", [Filesystem.xfs, Filesystem.ext4])
|
||||
@pytest.mark.require_plugin("power_control")
|
||||
def test_recovery_flush_reset_fs(cache_mode, fs):
|
||||
"""
|
||||
|
@@ -22,10 +22,10 @@ test_file_path = os.path.join(mount_point, "test_file")
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrize("cls", [CacheLineSize.LINE_4KiB, CacheLineSize.LINE_64KiB])
|
||||
@pytest.mark.parametrize("filesystem", Filesystem)
|
||||
@pytest.mark.parametrize("direct", [True, False])
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cls", [CacheLineSize.LINE_4KiB, CacheLineSize.LINE_64KiB])
|
||||
@pytest.mark.parametrizex("filesystem", Filesystem)
|
||||
@pytest.mark.parametrizex("direct", [True, False])
|
||||
@pytest.mark.require_plugin("power_control")
|
||||
def test_recovery_unplug_cache_fs(cache_mode, cls, filesystem, direct):
|
||||
"""
|
||||
@@ -102,8 +102,8 @@ def test_recovery_unplug_cache_fs(cache_mode, cls, filesystem, direct):
|
||||
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrize("cls", [CacheLineSize.LINE_4KiB, CacheLineSize.LINE_64KiB])
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cls", [CacheLineSize.LINE_4KiB, CacheLineSize.LINE_64KiB])
|
||||
@pytest.mark.require_plugin("power_control")
|
||||
def test_recovery_unplug_cache_raw(cache_mode, cls):
|
||||
"""
|
||||
|
@@ -22,7 +22,7 @@ bs = Size(512, Unit.KibiByte)
|
||||
mnt_point = "/mnt/cas/"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
def test_clean_stop_cache(cache_mode):
|
||||
@@ -152,8 +152,8 @@ def test_clean_stop_cache(cache_mode):
|
||||
test_file_3.remove(True)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("fs", Filesystem)
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("fs", Filesystem)
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
def test_clean_remove_core_with_fs(cache_mode, fs):
|
||||
@@ -238,7 +238,7 @@ def test_clean_remove_core_with_fs(cache_mode, fs):
|
||||
remove(mnt_point, True, True, True)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
|
||||
def test_clean_remove_core_without_fs(cache_mode):
|
||||
|
@@ -25,7 +25,7 @@ syslog_path = "/var/log/messages"
|
||||
|
||||
|
||||
@pytest.mark.require_plugin("scsi_debug_fua_signals", dev_size_mb="4096", opts="1")
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
def test_flush_signal_core(cache_mode):
|
||||
"""
|
||||
@@ -122,7 +122,7 @@ def test_flush_signal_core(cache_mode):
|
||||
|
||||
|
||||
@pytest.mark.require_plugin("scsi_debug_fua_signals", dev_size_mb="2048", opts="1")
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("core", DiskTypeSet([DiskType.hdd, DiskType.hdd4k, DiskType.sata]))
|
||||
def test_flush_signal_cache(cache_mode):
|
||||
"""
|
||||
@@ -219,7 +219,7 @@ def test_flush_signal_cache(cache_mode):
|
||||
|
||||
|
||||
@pytest.mark.require_plugin("scsi_debug_fua_signals", dev_size_mb="2048", opts="1")
|
||||
@pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.parametrizex("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))
|
||||
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
|
||||
def test_flush_signal_multilevel_cache(cache_mode):
|
||||
"""
|
||||
|
Reference in New Issue
Block a user