From b788f15f467573098a4d7492ca30e5900e1ba218 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Fri, 7 Jan 2022 19:52:35 +0100 Subject: [PATCH] iox-#27 Disable a death test for macOS --- .../test/moduletests/test_popo_chunk_distributor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp b/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp index a107b5dbdc0..03309960f00 100644 --- a/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp +++ b/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp @@ -120,7 +120,7 @@ class ChunkDistributor_test : public Test static constexpr std::chrono::milliseconds BLOCKING_DURATION{100}; - static constexpr iox::units::Duration DEADLOCK_TIMEOUT{5_s}; + static constexpr iox::units::Duration DEADLOCK_TIMEOUT{2_s}; Watchdog deadlockWatchdog{DEADLOCK_TIMEOUT}; ; }; @@ -129,6 +129,8 @@ constexpr std::chrono::milliseconds ChunkDistributor_test::BLOCKING_ template constexpr iox::units::Duration ChunkDistributor_test::DEADLOCK_TIMEOUT; +/// @todo iox-#898: this is broken on macOS and triggers the watchdog, even with 5 seconds timeout +#if !defined(__APPLE__) TYPED_TEST(ChunkDistributor_test, AddingNullptrQueueDoesNotWork) { auto sutData = this->getChunkDistributorData(); @@ -136,6 +138,7 @@ TYPED_TEST(ChunkDistributor_test, AddingNullptrQueueDoesNotWork) EXPECT_DEATH(IOX_DISCARD_RESULT(sut.tryAddQueue(nullptr)), ".*"); } +#endif TYPED_TEST(ChunkDistributor_test, NewChunkDistributorHasNoQueues) {