Skip to content

mw/com: add missing unit tests and enable build qnx 8 #286

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

Open
ahmed0mousa wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −28
Open

mw/com: add missing unit tests and enable build qnx 8 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39bb196
mw/com: add missing unit tests and enable build qnx 8
ahmed0mousa Apr 10, 2026
cdaa365
mw/com: reenable tests over qnx8
ahmed0mousa Apr 10, 2026
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
8 changes: 1 addition & 7 deletions score/mw/com/impl/bindings/lola/service_discovery/client/BUILD
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@bemerybmw bemerybmw Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are also some disabled tests which need to be reenabled. You can grep for 253098 to find them.

Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,13 @@ cc_gtest_unit_test(
srcs = [
"service_discovery_client_find_service_test.cpp",
"service_discovery_client_offer_service_test.cpp",
"service_discovery_client_sequence_test.cpp",
"service_discovery_client_start_find_service_test.cpp",
"service_discovery_client_stop_find_service_test.cpp",
"service_discovery_client_stop_offer_service_test.cpp",
"service_discovery_client_worker_thread_test.cpp",
],
features = COMPILER_WARNING_FEATURES,
# TODO: Ticket-253098
target_compatible_with = select({
"@score_bazel_platforms//settings:x86_64-qnx": [
"@score_bazel_platforms//version:sdp_7.1.0",
],
"//conditions:default": [],
}),
visibility = [
"//score/mw/com/impl/bindings/lola/service_discovery/client:__pkg__",
],
Expand Down
5 changes: 0 additions & 5 deletions ...om/impl/bindings/lola/service_discovery/client/service_discovery_client_sequence_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,6 @@ TEST_F(ServiceDiscoveryClientFixture, FilesystemIsNotRecrawledIfExactSameSearchA
// Expecting per crawl and watch of the filesystem for a specific instance we expect one "new" watch, no more!
EXPECT_CALL(inotify_instance_mock_, AddWatch(_, _)).Times(1);

WhichContainsAServiceDiscoveryClient();

FindServiceHandle expected_handle_1{make_FindServiceHandle(1U)};
FindServiceHandle expected_handle_2{make_FindServiceHandle(2U)};

Expand Down Expand Up @@ -573,9 +571,6 @@ TEST_F(ServiceDiscoveryClientFixture, FilesystemIsNotRecrawledIfAnySearchAlready
// Given a ServiceDiscoveryClient with mocked inotify instance and an offered service instance
WhichContainsAServiceDiscoveryClient().WithAnOfferedService(kConfigStoreQm1.GetInstanceIdentifier());

// and given
EXPECT_TRUE(service_discovery_client_->OfferService(kConfigStoreQm1.GetInstanceIdentifier()).has_value());

// When starting the same service discovery for above offer twice recursively
testing::MockFunction<void(std::vector<HandleType>, FindServiceHandle)> inner_handler{};
EXPECT_CALL(inner_handler, Call(_, _))
Expand Down
16 changes: 0 additions & 16 deletions score/mw/com/impl/bindings/lola/test/proxy_component_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ class ProxyServiceDiscoveryFixture : public ProxyWithRealMemFixture
// Test to check that race condition in Ticket-169333 does not occur.
TEST_F(ProxyServiceDiscoveryFixture, CallingStartFindServiceInHandlerAndStartFindServiceInMainThreadDoesNotDeadLock)
{
#if defined(__QNX__) && __QNX__ >= 800 && defined(__x86_64__)
GTEST_SKIP() << "TODO: Ticket-253098 Inotify not supported on QNX 8 x86_64 filesystem";
#else
MockFunction<void(ServiceHandleContainer<HandleType>, FindServiceHandle)> find_service_handler_2{};

// Given a real ServiceDiscovery and a configuration that contains no events
Expand Down Expand Up @@ -303,15 +300,11 @@ TEST_F(ProxyServiceDiscoveryFixture, CallingStartFindServiceInHandlerAndStartFin

// Then we expect that both calls to StartFindService are called without a dead lock and both handlers are called
handler_done_notifier_.waitWithAbort(stop_token_);
#endif
}

// Test to check that race condition in Ticket-169333 does not occur.
TEST_F(ProxyServiceDiscoveryFixture, CallingStartFindServiceInHandlerAndStopFindServiceInMainThreadDoesNotDeadLock)
{
#if defined(__QNX__) && __QNX__ >= 800 && defined(__x86_64__)
GTEST_SKIP() << "TODO: Ticket-253098 Inotify not supported on QNX 8 x86_64 filesystem";
#else
// Given a real ServiceDiscovery and a configuration that contains no events
WithARealServiceDiscovery().WithAConfigurationContainingNoEvents();
const InstanceIdentifier instance_identifier{config_store_->GetInstanceIdentifier()};
Expand All @@ -335,15 +328,11 @@ TEST_F(ProxyServiceDiscoveryFixture, CallingStartFindServiceInHandlerAndStopFind
// Then we expect that both the call to StartFindService in the handler and the call to StopFindService are called
// without a dead lock and that the handler are finishes
handler_done_notifier_.waitWithAbort(stop_token_);
#endif
}

// Test to check that race condition in Ticket-169333 does not occur.
TEST_F(ProxyServiceDiscoveryFixture, CallingStopFindServiceInHandlerAndStartFindServiceInMainThreadDoesNotDeadLock)
{
#if defined(__QNX__) && __QNX__ >= 800 && defined(__x86_64__)
GTEST_SKIP() << "TODO: Ticket-253098 Inotify not supported on QNX 8 x86_64 filesystem";
#else
MockFunction<void(ServiceHandleContainer<HandleType>, FindServiceHandle)> find_service_handler_2{};

// Given a real ServiceDiscovery and a configuration that contains no events
Expand Down Expand Up @@ -372,15 +361,11 @@ TEST_F(ProxyServiceDiscoveryFixture, CallingStopFindServiceInHandlerAndStartFind

// Then we expect that both calls to StartFindService are called without a dead lock and both handlers are called
handler_done_notifier_.waitWithAbort(stop_token_);
#endif
}

// Test to check that race condition in Ticket-169333 does not occur.
TEST_F(ProxyServiceDiscoveryFixture, CallingStopFindServiceInHandlerAndStopFindServiceInMainThreadDoesNotDeadLock)
{
#if defined(__QNX__) && __QNX__ >= 800 && defined(__x86_64__)
GTEST_SKIP() << "TODO: Ticket-253098 Inotify not supported on QNX 8 x86_64 filesystem";
#else
// Given a real ServiceDiscovery and a configuration that contains no events
WithARealServiceDiscovery().WithAConfigurationContainingNoEvents();
const InstanceIdentifier instance_identifier{config_store_->GetInstanceIdentifier()};
Expand All @@ -404,7 +389,6 @@ TEST_F(ProxyServiceDiscoveryFixture, CallingStopFindServiceInHandlerAndStopFindS
// Then we expect that both the call to StartFindService in the handler and the call to StopFindService are called
// without a dead lock and that the handler are finishes
handler_done_notifier_.waitWithAbort(stop_token_);
#endif
}

} // namespace
Expand Down
Loading