From cfb2305f80a140ab3a2b6516c0a6003fa3129772 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 8 Dec 2016 15:33:02 +0100 Subject: [PATCH] tests: unittest_throttle avoid ASSERT_DEATH Combined with threads it may cause intermittent failures. Fixes: http://tracker.ceph.com/issues/18036 Signed-off-by: Loic Dachary --- src/test/common/Throttle.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc index 16c2456845d6d..000fb83a682b6 100644 --- a/src/test/common/Throttle.cc +++ b/src/test/common/Throttle.cc @@ -61,10 +61,6 @@ protected: }; TEST_F(ThrottleTest, Throttle) { - ASSERT_DEATH({ - Throttle throttle(g_ceph_context, "throttle", -1); - }, ""); - int64_t throttle_max = 10; Throttle throttle(g_ceph_context, "throttle", throttle_max); ASSERT_EQ(throttle.get_max(), throttle_max); @@ -74,7 +70,6 @@ TEST_F(ThrottleTest, Throttle) { TEST_F(ThrottleTest, take) { int64_t throttle_max = 10; Throttle throttle(g_ceph_context, "throttle", throttle_max); - ASSERT_DEATH(throttle.take(-1), ""); ASSERT_EQ(throttle.take(throttle_max), throttle_max); ASSERT_EQ(throttle.take(throttle_max), throttle_max * 2); } @@ -90,7 +85,6 @@ TEST_F(ThrottleTest, get) { ASSERT_EQ(throttle.put(throttle_max), 0); } - ASSERT_DEATH(throttle.get(-1), ""); ASSERT_FALSE(throttle.get(5)); ASSERT_EQ(throttle.put(5), 0); -- 2.39.5