From b82cd1df96a5c49b339a73c6f5eeb7d2e43da9a8 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Fri, 19 Jul 2024 11:37:41 +0200 Subject: [PATCH] guess test case --- src/tests/ras/us_remote_agent/main.cc | 4 ++-- .../utils/inject_manager/inject_manager.cc | 24 +++++++++---------- .../ras/utils/inject_manager/inject_manager.h | 4 ++-- .../ras/utils/test_phase/local_test_phase.cc | 3 +-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/tests/ras/us_remote_agent/main.cc b/src/tests/ras/us_remote_agent/main.cc index f550af04..1c526674 100644 --- a/src/tests/ras/us_remote_agent/main.cc +++ b/src/tests/ras/us_remote_agent/main.cc @@ -75,8 +75,8 @@ int main(int argc, char **argv) { } else if (std::string{"check-safe"}.compare(action) == 0) { return inject_mgmt.IsLastShutdownSafe(dimm_colls) ? 0 : 1; - } else if (std::string{"check-unsafe"}.compare(action) == 0) { - return inject_mgmt.IsLastShutdownUnsafe(dimm_colls) ? 0 : 1; +// } else if (std::string{"check-unsafe"}.compare(action) == 0) { +// return inject_mgmt.IsLastShutdownUnsafe(dimm_colls) ? 0 : 1; } else if (std::string{"cleanup"}.compare(action) == 0) { return CleanUp(test_dir, mountpoint_args); diff --git a/src/tests/ras/utils/inject_manager/inject_manager.cc b/src/tests/ras/utils/inject_manager/inject_manager.cc index 86dafcd5..3fbb60db 100644 --- a/src/tests/ras/utils/inject_manager/inject_manager.cc +++ b/src/tests/ras/utils/inject_manager/inject_manager.cc @@ -145,18 +145,18 @@ InjectManager::InjectManager(std::string test_dir, std::string policy) { test_dir_ = test_dir; } -bool InjectManager::IsLastShutdownUnsafe( - const std::vector &dimm_namespaces) const { - std::function compare = [](int rec, int cur) -> bool { - return cur > rec; - }; - - if (!CheckUSCDiff(dimm_namespaces, compare)) { - std::cerr << "Unexpected safe shutdown of NVDIMM" << std::endl; - return false; - } - return true; -} +// bool InjectManager::IsLastShutdownUnsafe( +// const std::vector &dimm_namespaces) const { +// std::function compare = [](int rec, int cur) -> bool { +// return cur > rec; +// }; + +// if (!CheckUSCDiff(dimm_namespaces, compare)) { +// std::cerr << "Unexpected safe shutdown of NVDIMM" << std::endl; +// return false; +// } +// return true; +// } bool InjectManager::IsLastShutdownSafe( const std::vector &dimm_namespaces) const { diff --git a/src/tests/ras/utils/inject_manager/inject_manager.h b/src/tests/ras/utils/inject_manager/inject_manager.h index 820f5aec..c9def641 100644 --- a/src/tests/ras/utils/inject_manager/inject_manager.h +++ b/src/tests/ras/utils/inject_manager/inject_manager.h @@ -48,8 +48,8 @@ class InjectManager { InjectManager(std::string test_dir, std::string policy); - bool IsLastShutdownUnsafe( - const std::vector &dimm_namespaces) const; +// bool IsLastShutdownUnsafe( +// const std::vector &dimm_namespaces) const; bool IsLastShutdownSafe( const std::vector &dimm_namespaces) const; int RecordUSC(const std::vector &dimm_namespaces) const; diff --git a/src/tests/ras/utils/test_phase/local_test_phase.cc b/src/tests/ras/utils/test_phase/local_test_phase.cc index db99e812..69cda521 100644 --- a/src/tests/ras/utils/test_phase/local_test_phase.cc +++ b/src/tests/ras/utils/test_phase/local_test_phase.cc @@ -72,8 +72,7 @@ int LocalTestPhase::Inject() const { int LocalTestPhase::CheckUSC() const { InjectManager inject_mgmt{config_.GetTestDir(), policy_}; - if (inject_mgmt.IsLastShutdownSafe(safe_namespaces) && - inject_mgmt.IsLastShutdownUnsafe(unsafe_namespaces)) { + if (inject_mgmt.IsLastShutdownSafe(safe_namespaces)) { return 0; } return -1;