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

Refactor check_msg + fixes in touched files

Browse Source 
Signed-off-by: Daniel Madej <daniel.madej@intel.com>
This commit is contained in:
Daniel Madej
2020-01-17 16:47:02 +01:00
parent 0621ca59b3
commit f31587fc9d
5 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/functional/tests/fault_injection/test_fault_injection_opencas_load.py
View File

@@ -2,14 +2,13 @@
# Copyright(c) 2020 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause-Clear
#
from time import sleep
import pytest
from api.cas import casadm, casadm_parser, cli, cli_messages
from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from core.test_run import TestRun
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from test_tools import fs_utils
from test_tools.dd import Dd
from test_tools.disk_utils import Filesystem
@@ -69,7 +68,7 @@ def test_stop_no_flush_load_cache(cache_mode, filesystem):
output = TestRun.executor.run_expect_fail(cli.start_cmd(
cache_dev=str(cache_part.system_path), cache_mode=str(cache_mode.name.lower()),
force=False, load=False))
cli_messages.check_msg(output, cli_messages.start_cache_with_existing_metadata)
cli_messages.check_stderr_msg(output, cli_messages.start_cache_with_existing_metadata)
with TestRun.step("Load cache."):
cache = casadm.load_cache(cache.cache_device)
@@ -146,7 +145,7 @@ def test_stop_no_flush_load_cache_no_fs(cache_mode):
output = TestRun.executor.run_expect_fail(cli.start_cmd(
cache_dev=str(cache_part.system_path), cache_mode=str(cache_mode.name.lower()),
force=False, load=False))
cli_messages.check_msg(output, cli_messages.start_cache_with_existing_metadata)
cli_messages.check_stderr_msg(output, cli_messages.start_cache_with_existing_metadata)
with TestRun.step("Load cache."):
cache = casadm.load_cache(cache.cache_device)

10
test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py
View File

@@ -7,8 +7,8 @@ import pytest
from api.cas import casadm, casadm_parser, cli, cli_messages
from api.cas.cache_config import CacheMode
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
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.size import Size, Unit
@@ -109,11 +109,11 @@ def test_stop_cache_with_mounted_partition(cache_mode):
with TestRun.step("Try to remove core from cache."):
output = TestRun.executor.run_expect_fail(cli.remove_core_cmd(cache_id=str(cache.cache_id),
core_id=str(core.core_id)))
cli_messages.check_msg(output, cli_messages.remove_mounted_core)
cli_messages.check_stderr_msg(output, cli_messages.remove_mounted_core)
with TestRun.step("Try to stop CAS."):
output = TestRun.executor.run_expect_fail(cli.stop_cmd(cache_id=str(cache.cache_id)))
cli_messages.check_msg(output, cli_messages.stop_cache_mounted_core)
cli_messages.check_stderr_msg(output, cli_messages.stop_cache_mounted_core)
with TestRun.step("Unmount core device."):
core.unmount()
@@ -158,12 +158,12 @@ def test_add_cached_core(cache_mode):
output = TestRun.executor.run_expect_fail(
cli.add_core_cmd(cache_id=str(cache2.cache_id), core_dev=str(core_part.system_path),
core_id=str(core.core_id)))
cli_messages.check_msg(output, cli_messages.add_cached_core)
cli_messages.check_stderr_msg(output, cli_messages.add_cached_core)
with TestRun.step("Try adding the same core device to the same cache for the second time."):
output = TestRun.executor.run_expect_fail(
cli.add_core_cmd(cache_id=str(cache1.cache_id), core_dev=str(core_part.system_path)))
cli_messages.check_msg(output, cli_messages.add_cached_core)
cli_messages.check_stderr_msg(output, cli_messages.add_cached_core)
with TestRun.step("Stop caches."):
casadm.stop_all_caches()

4
test/functional/tests/fault_injection/test_multilevel_cache.py
View File

@@ -6,8 +6,8 @@
import pytest
from api.cas import casadm, cli, cli_messages
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from core.test_run import TestRun
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from test_utils.size import Size, Unit
@@ -49,7 +49,7 @@ def test_remove_multilevel_core():
output = TestRun.executor.run_expect_fail(cli.remove_core_cmd(cache_id=str(cache1.cache_id),
core_id=str(core1.core_id),
force=True))
cli_messages.check_msg(output, cli_messages.remove_multilevel_core)
cli_messages.check_stderr_msg(output, cli_messages.remove_multilevel_core)
with TestRun.step("Stop cache."):
casadm.stop_all_caches()