Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19263 ] User configuration for SHM metatraffic #3753

Merged
merged 19 commits into from
Aug 2, 2023
Merged

[19263 ] User configuration for SHM metatraffic #3753

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bef5e29
Refs #18966. Forcing UDP for metatraffic.
MiguelCompany Jun 28, 2023
0400e26
Refs #19255. Allowing metatraffic depends on flags.
MiguelCompany Jul 27, 2023
4d553dc
Refs #19255. NetworkFactory constructor receives RTPSParticipantAttri…
MiguelCompany Jul 27, 2023
432a4be
Refs #19255. Parsing property from participant attributes.
MiguelCompany Jul 27, 2023
c900486
Refs #19255. Remove unused mp_ResourceSemaphore.
MiguelCompany Jul 27, 2023
89da725
Refs #19263. Fixed NetworkFactoryTests.
MiguelCompany Jul 27, 2023
1964fff
Refs #19263. Fixed TCPv6Tests.
MiguelCompany Jul 27, 2023
1417a6e
Refs #19263. Fixed link errors on unit tests.
MiguelCompany Jul 27, 2023
a78820a
Refs #19263. Apply suggestions from code review.
MiguelCompany Jul 27, 2023
f6bef17
Refs #19263. Additional suggestions from code review.
MiguelCompany Jul 27, 2023
74737a9
Refs #19263. Added possitive test.
MiguelCompany Jul 31, 2023
9ccb538
Refs #19263. Added negative test.
MiguelCompany Jul 31, 2023
b204f5d
Refs #19263. Configuration for avoid_builtin_multicast on PubSubWriter.
MiguelCompany Jul 31, 2023
f1526bf
Refs #19263. Configuration for avoid_builtin_multicast on PubSubReader.
MiguelCompany Jul 31, 2023
07a5493
Refs #19263. Configuration for max_multicast_locators_number on PubSu…
MiguelCompany Jul 31, 2023
773a210
Refs #19263. Enable multicast discovery on new test.
MiguelCompany Jul 31, 2023
57a0c2b
Refs #19263. Apply suggestions.
MiguelCompany Jul 31, 2023
8a74e20
Refs #19263. Add feature to versions.md.
MiguelCompany Aug 2, 2023
932a0dc
Refs #19263. Apply suggestion.
MiguelCompany Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include "BlackboxTests.hpp"
#include "mock/BlackboxMockConsumer.h"

#include <chrono>
#include <cstdint>
Expand Down Expand Up @@ -235,6 +236,30 @@ TEST(SHMUDP, SHM_metatraffic_config)
shm_metatraffic_test(TEST_TOPIC_NAME, "all", true, true);
}

TEST(SHMUDP, SHM_metatraffic_wrong_config)
{
using eprosima::fastdds::dds::BlackboxMockConsumer;

/* Set up log */
BlackboxMockConsumer* helper_consumer = new BlackboxMockConsumer();
Log::ClearConsumers(); // Remove default consumers
Log::RegisterConsumer(std::unique_ptr<LogConsumer>(helper_consumer)); // Registering a consumer transfer ownership
// Filter specific message
Log::SetVerbosity(Log::Kind::Warning);
Log::SetCategoryFilter(std::regex("RTPS_NETWORK"));
Log::SetErrorStringFilter(std::regex(".*__WRONG_VALUE__.*"));

// Perfrorm test
jsan-rt marked this conversation as resolved.
Show resolved Hide resolved
shm_metatraffic_test(TEST_TOPIC_NAME, "__WRONG_VALUE__", false, false);

/* Check logs */
Log::Flush();
EXPECT_EQ(helper_consumer->ConsumedEntries().size(), 1u);

/* Clean-up */
Log::Reset(); // This calls to ClearConsumers, which deletes the registered consumer
}

#ifdef INSTANTIATE_TEST_SUITE_P
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
#else
Expand Down