diff --git a/src/tests/ras/utils/inject_manager/inject_manager.cc b/src/tests/ras/utils/inject_manager/inject_manager.cc index 86dafcd..3fbb60d 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 820f5ae..c9def64 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 db99e81..69cda52 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;