From d678612c35aa8f7dcbbe47a4c962f22c490f7b03 Mon Sep 17 00:00:00 2001 From: Piotr Debski Date: Wed, 20 Jul 2022 13:28:19 +0200 Subject: [PATCH] Include standby tests for CI scope Signed-off-by: Piotr Debski --- test/functional/tests/cli/test_cli_standby.py | 10 ++++++++++ .../failover_standby/test_cache_activation_perf.py | 1 + .../test_fault_injection_standby_core.py | 3 +++ .../test_standby_activate_the_same_cache_path.py | 1 + 4 files changed, 15 insertions(+) diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index e6604c7..71dc6ff 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -36,6 +36,7 @@ from api.cas.ioclass_config import IoClass from api.cas.core import CoreStatus +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_standby_neg_cli_params(): """ @@ -104,6 +105,7 @@ def test_standby_neg_cli_params(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_activate_neg_cli_params(): """ @@ -183,6 +185,7 @@ def test_activate_neg_cli_params(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_standby_neg_cli_management(): """ @@ -258,6 +261,7 @@ def test_standby_neg_cli_management(): cache.stop() +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_start_neg_cli_flags(): """ @@ -311,6 +315,7 @@ def test_start_neg_cli_flags(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_activate_without_detach(): """ @@ -373,6 +378,7 @@ def test_activate_without_detach(): TestRun.fail("The cache exported object is not a block device") +@pytest.mark.CI @pytest.mark.require_disk("active_cache", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("standby_cache", DiskTypeSet([DiskType.nand, DiskType.optane])) def test_activate_neg_cache_line_size(): @@ -463,6 +469,7 @@ def test_activate_neg_cache_line_size(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) def test_standby_init_with_preexisting_metadata(): @@ -520,6 +527,7 @@ def test_standby_init_with_preexisting_metadata(): TestRun.LOGGER.error("Standby cache instance is not running!") +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) @pytest.mark.parametrizex("filesystem", Filesystem) @@ -570,6 +578,7 @@ def test_standby_init_with_preexisting_filesystem(filesystem): TestRun.LOGGER.error("Standby cache instance is not running!") +@pytest.mark.CI @pytest.mark.require_disk("caches", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("core", DiskTypeLowerThan("caches")) def test_standby_activate_with_corepool(): @@ -627,6 +636,7 @@ def test_standby_activate_with_corepool(): TestRun.fail(f"First core status should be active but is {core.get_status()}.") +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.parametrizex("cache_line_size", CacheLineSize) def test_standby_start_stop(cache_line_size): diff --git a/test/functional/tests/failover_standby/test_cache_activation_perf.py b/test/functional/tests/failover_standby/test_cache_activation_perf.py index 3796435..c22442d 100644 --- a/test/functional/tests/failover_standby/test_cache_activation_perf.py +++ b/test/functional/tests/failover_standby/test_cache_activation_perf.py @@ -25,6 +25,7 @@ fio_jobs = 4 cls = CacheLineSize.LINE_4KiB +@pytest.mark.CI @pytest.mark.require_disk("cache_1", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("cache_2", DiskTypeSet([DiskType.optane])) @pytest.mark.require_disk("core", DiskTypeSet([DiskType.hdd, DiskType.hdd4k])) diff --git a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py b/test/functional/tests/fault_injection/test_fault_injection_standby_core.py index 14f76a3..514d075 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py +++ b/test/functional/tests/fault_injection/test_fault_injection_standby_core.py @@ -26,6 +26,7 @@ from api.cas.cli_messages import ( ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) def test_activate_neg_cache_id(): """ @@ -96,6 +97,7 @@ def test_activate_neg_cache_id(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) def test_activate_incomplete_cache(): @@ -212,6 +214,7 @@ def test_activate_incomplete_cache(): ) +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) def test_activate_neg_core_size(): diff --git a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py b/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py index 06d7690..35adad4 100644 --- a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py +++ b/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py @@ -13,6 +13,7 @@ from test_utils.size import Size, Unit from api.cas.cache_config import CacheStatus +@pytest.mark.CI @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.nand, DiskType.optane])) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) def test_standby_activate_the_same_cache_path():