]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: unittest_throttle avoid ASSERT_DEATH 12393/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 8 Dec 2016 14:33:02 +0000 (15:33 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 8 Dec 2016 14:33:02 +0000 (15:33 +0100)
Combined with threads it may cause intermittent failures.

Fixes: http://tracker.ceph.com/issues/18036
Signed-off-by: Loic Dachary <loic@dachary.org>
src/test/common/Throttle.cc

index 16c2456845d6d1c4d59155c6aea1b943c7563750..000fb83a682b62cf4ef6b08c6d40b3a2adbd2c7e 100644 (file)
@@ -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);