iox-#1036 Fix mq startup race test on Windows

eclipse-iceoryx · Sep 4, 2023 · eed1224 · eed1224
1 parent 3aaac0b
commit eed1224
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp
@@ -47,9 +47,6 @@ class UnixDomainSocket
     using UdsName_t = string<LONGEST_VALID_NAME>;
     using Message_t = string<MAX_MESSAGE_SIZE>;
 
-    using result_t = expected<UnixDomainSocket, IpcChannelError>;
-    using errorType_t = IpcChannelError;
-
     UnixDomainSocket() noexcept = delete;
     UnixDomainSocket(const UnixDomainSocket& other) = delete;
     UnixDomainSocket(UnixDomainSocket&& other) noexcept;

diff --git a/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp b/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp
@@ -61,6 +61,8 @@ class CMqInterfaceStartupRace_test : public Test
   public:
     virtual void SetUp()
     {
+        platform::IoxIpcChannelType::create(roudi::IPC_CHANNEL_ROUDI_NAME, IpcChannelSide::SERVER)
+            .and_then([this](auto& channel) { this->m_roudiQueue.emplace(std::move(channel)); });
         ASSERT_THAT(m_roudiQueue.has_value(), true);
     }
     virtual void TearDown()
@@ -110,8 +112,7 @@ class CMqInterfaceStartupRace_test : public Test
 
     /// @note smart_lock in combination with optional is currently not really usable
     std::mutex m_roudiQueueMutex;
-    platform::IoxIpcChannelType::result_t m_roudiQueue{
-        platform::IoxIpcChannelType::create(roudi::IPC_CHANNEL_ROUDI_NAME, IpcChannelSide::SERVER)};
+    optional<platform::IoxIpcChannelType> m_roudiQueue;
     std::mutex m_appQueueMutex;
     optional<platform::IoxIpcChannelType> m_appQueue;
 };