Skip to content

Commit

Permalink
iox-eclipse-iceoryx#2185 Fix CMqInterfaceStartupRace_test
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Feb 13, 2024
1 parent beacc98 commit 138cf7b
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class CMqInterfaceStartupRace_test : public Test
virtual void SetUp()
{
platform::IoxIpcChannelType::Builder_t()
.name(roudi::IPC_CHANNEL_ROUDI_NAME)
.name(m_roudiIpcChannelName)
.channelSide(PosixIpcChannelSide::SERVER)
.create()
.and_then([this](auto& channel) { this->m_roudiQueue.emplace(std::move(channel)); });
Expand Down Expand Up @@ -105,7 +105,7 @@ class CMqInterfaceStartupRace_test : public Test
if (!m_appQueue.has_value())
{
platform::IoxIpcChannelType::Builder_t()
.name(MqAppName)
.name(runtime::ipcChannelNameToInterfaceName(MqAppName).expect("valid interface name"))
.channelSide(PosixIpcChannelSide::CLIENT)
.create()
.and_then([this](auto& channel) { this->m_appQueue.emplace(std::move(channel)); });
Expand All @@ -120,6 +120,8 @@ class CMqInterfaceStartupRace_test : public Test
optional<platform::IoxIpcChannelType> m_roudiQueue;
std::mutex m_appQueueMutex;
optional<platform::IoxIpcChannelType> m_appQueue;
RuntimeName_t m_roudiIpcChannelName{
runtime::ipcChannelNameToInterfaceName(roudi::IPC_CHANNEL_ROUDI_NAME).expect("valid interface name")};
};

#if !defined(__APPLE__)
Expand Down Expand Up @@ -150,7 +152,7 @@ TEST_F(CMqInterfaceStartupRace_test, ObsoleteRouDiMq)
});

auto m_roudiQueue2 = platform::IoxIpcChannelType::Builder_t()
.name(roudi::IPC_CHANNEL_ROUDI_NAME)
.name(m_roudiIpcChannelName)
.channelSide(PosixIpcChannelSide::SERVER)
.create();

Expand Down Expand Up @@ -202,7 +204,7 @@ TEST_F(CMqInterfaceStartupRace_test, ObsoleteRouDiMqWithFullMq)
});

auto newRoudi = platform::IoxIpcChannelType::Builder_t()
.name(roudi::IPC_CHANNEL_ROUDI_NAME)
.name(m_roudiIpcChannelName)
.channelSide(PosixIpcChannelSide::SERVER)
.create();

Expand Down

0 comments on commit 138cf7b

Please sign in to comment.