update sources to 12.2.10

[ceph.git] / ceph / src / test / common / test_mutex.cc

diff --git a/ceph/src/test/common/test_mutex.cc b/ceph/src/test/common/test_mutex.cc
index a4b496103e7cc85dc3850b1f30439de64166b250..ed987e0d9ae09b5ae8b1e45cf54853cf8a8da97c 100644 (file)
--- a/ceph/src/test/common/test_mutex.cc
+++ b/ceph/src/test/common/test_mutex.cc
@@ -11,19 +11,6 @@
 #include "common/config.h"
 #include "include/coredumpctl.h"
 
-/*
- * Override normal ceph assert.
- * It is needed to prevent hang when we assert() and THEN still wait on lock().
- */
-namespace ceph
-{
-  void __ceph_assert_fail(const char *assertion, const char *file, int line,
-        const char *func)
-  {
-    throw 0;
-  }
-}
-
 static CephContext* cct;
 
 static void do_init() {
@@ -44,7 +31,8 @@ static void disable_lockdep() {
 TEST(Mutex, NormalAsserts) {
   Mutex* m = new Mutex("Normal",false);
   m->Lock();
-  EXPECT_THROW(m->Lock(), int);
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  EXPECT_DEATH(m->Lock(), ".*");
 }
 
 TEST(Mutex, RecursiveWithLockdep) {