From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 14 Mar 2012 11:46:51 +0000 (+0100)
Subject: [1568] Fix a test that failed
X-Git-Tag: trac2351_base~226^2~116^2~121^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=758d1d155f95a65702969866454ccfdfd90a7336;p=thirdparty%2Fkea.git

[1568] Fix a test that failed

We can no longer EXPECT_THROW, if we don't throw.
---

diff --git a/src/lib/util/tests/buffer_unittest.cc b/src/lib/util/tests/buffer_unittest.cc
index 666924ed5b..8cccd282e3 100644
--- a/src/lib/util/tests/buffer_unittest.cc
+++ b/src/lib/util/tests/buffer_unittest.cc
@@ -182,7 +182,17 @@ TEST_F(BufferTest, outputBufferReadat) {
     for (int i = 0; i < sizeof(testdata); i ++) {
         EXPECT_EQ(testdata[i], obuffer[i]);
     }
-    EXPECT_THROW(obuffer[sizeof(testdata)], isc::util::InvalidBufferPosition);
+#ifdef EXPECT_DEATH
+    // We use assert now, so we check it dies
+    EXPECT_DEATH({
+        try {
+            obuffer[sizeof(testdata)];
+        } catch (...) {
+            // Prevent exceptions killing the application, we need
+            // to make sure it dies the real hard way
+        }
+        }, "");
+#endif
 }
 
 TEST_F(BufferTest, outputBufferClear) {