import quincy beta 17.1.0

[ceph.git] / ceph / src / seastar / src / testing / seastar_test.cc

diff --git a/ceph/src/seastar/src/testing/seastar_test.cc b/ceph/src/seastar/src/testing/seastar_test.cc
index 4aa7c7cfc782032832043c6b9354776c7ec51c62..d38a309815af802610baa653831868e36a59055c 100644 (file)
--- a/ceph/src/seastar/src/testing/seastar_test.cc
+++ b/ceph/src/seastar/src/testing/seastar_test.cc
@@ -101,12 +101,13 @@ std::function<bool(const std::exception&)> message_contains(std::string_view exp
 
 } // exception_predicate
 
-scoped_no_abort_on_internal_error::scoped_no_abort_on_internal_error() {
-    set_abort_on_internal_error(false);
+scoped_no_abort_on_internal_error::scoped_no_abort_on_internal_error() noexcept
+    : _prev(set_abort_on_internal_error(false))
+{
 }
 
 scoped_no_abort_on_internal_error::~scoped_no_abort_on_internal_error() {
-    set_abort_on_internal_error(true);
+    set_abort_on_internal_error(_prev);
 }
 
 }