From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 8 Dec 2016 14:33:02 +0000 (+0100)
Subject: tests: unittest_throttle avoid ASSERT_DEATH
X-Git-Tag: v11.1.1~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12393%2Fhead;p=ceph.git

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 <loic@dachary.org>
---

diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc
index 16c2456845d6..000fb83a682b 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);