diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 11:49:38 +0200 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 11:49:38 +0200 |
commit | 016612733da6f4e16428ec3f95dc5e19b932a0c5 (patch) | |
tree | 4f626b6113e79ad41c1289b5b6cb4c1f6f0f68f8 /searchlib/src/tests/util | |
parent | d161b6bcb87566a31cb5e0700b84f968539f502f (diff) |
some more cleanup
Diffstat (limited to 'searchlib/src/tests/util')
-rw-r--r-- | searchlib/src/tests/util/ioerrorhandler/ioerrorhandler_test.cpp | 12 | ||||
-rw-r--r-- | searchlib/src/tests/util/sigbushandler/sigbushandler_test.cpp | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/searchlib/src/tests/util/ioerrorhandler/ioerrorhandler_test.cpp b/searchlib/src/tests/util/ioerrorhandler/ioerrorhandler_test.cpp index aaa2a138353..fb1c1a356f6 100644 --- a/searchlib/src/tests/util/ioerrorhandler/ioerrorhandler_test.cpp +++ b/searchlib/src/tests/util/ioerrorhandler/ioerrorhandler_test.cpp @@ -213,8 +213,7 @@ TEST_F("Test that ioerror handler can process read error", Fixture) injectErrno = EIO; injectreadErrnoTrigger = 1; f.file->ReadBuf(buf, fileSize); - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } catch (std::runtime_error &e) { LOG(info, "Caught std::runtime_error exception: %s", e.what()); EXPECT_TRUE(strstr(e.what(), "Input/output error") != nullptr); @@ -253,8 +252,7 @@ TEST_F("Test that ioerror handler can process pread error", Fixture) injectErrno = EIO; injectpreadErrnoTrigger = 1; f.file->ReadBuf(buf, fileSize, 0); - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } catch (std::runtime_error &e) { LOG(info, "Caught std::runtime_error exception: %s", e.what()); EXPECT_TRUE(strstr(e.what(), "Input/output error") != nullptr); @@ -287,8 +285,7 @@ TEST_F("Test that ioerror handler can process write error", Fixture) injectErrno = EIO; injectwriteErrnoTrigger = 1; f.writeTestString(); - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } catch (std::runtime_error &e) { LOG(info, "Caught std::runtime_error exception: %s", e.what()); EXPECT_TRUE(strstr(e.what(), "Input/output error") != nullptr); @@ -322,8 +319,7 @@ TEST_F("Test that ioerror handler can process pwrite error", Fixture) injectErrno = EIO; injectpwriteErrnoTrigger = 1; f.writeTestString(); - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } catch (std::runtime_error &e) { LOG(info, "Caught std::runtime_error exception: %s", e.what()); EXPECT_TRUE(strstr(e.what(), "Input/output error") != nullptr); diff --git a/searchlib/src/tests/util/sigbushandler/sigbushandler_test.cpp b/searchlib/src/tests/util/sigbushandler/sigbushandler_test.cpp index 1253cab4a74..658ad17544a 100644 --- a/searchlib/src/tests/util/sigbushandler/sigbushandler_test.cpp +++ b/searchlib/src/tests/util/sigbushandler/sigbushandler_test.cpp @@ -63,8 +63,7 @@ TEST("Test that sigbus handler can trap synthetic sigbus") if (sigsetjmp(sjb, 1) == 0) { sbh.setUnwind(&sjb); kill(getpid(), SIGBUS); - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } EXPECT_TRUE(sbh.fired()); { @@ -100,8 +99,7 @@ TEST("Test that sigbus handler can trap normal sigbus") if (sigsetjmp(sjb, 1) == 0) { sbh.setUnwind(&sjb); r = *p; - LOG(error, "Should never get here"); - LOG_ABORT("should not be reached"); + LOG_ABORT("Should never get here"); } EXPECT_TRUE(sbh.fired()); EXPECT_TRUE(r == '\0'); |