diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-18 20:11:57 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-18 20:11:57 +0000 |
commit | b30bf80580f09f15ee6686ff818cd36d923e1291 (patch) | |
tree | 273782d0605a08ce382dcf09078d11ed800cca58 /dev-cpp/sdbus-c++/files | |
parent | 51e7ea94956939599972c733f5b65fe71c7eb857 (diff) |
gentoo auto-resync : 18:02:2023 - 20:11:56
Diffstat (limited to 'dev-cpp/sdbus-c++/files')
-rw-r--r-- | dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch b/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch new file mode 100644 index 000000000000..93767dc94be7 --- /dev/null +++ b/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch @@ -0,0 +1,39 @@ +From c812d03bc726aafc90f996073bfc327bb0ae230d Mon Sep 17 00:00:00 2001 +From: Stanislav Angelovic <stanislav.angelovic@siemens.com> +Date: Mon, 2 Jan 2023 15:05:57 +0100 +Subject: [PATCH] fix: integration tests for libsystemd v251 + +diff --git a/tests/integrationtests/DBusStandardInterfacesTests.cpp b/tests/integrationtests/DBusStandardInterfacesTests.cpp +index a291be3..6381587 100644 +--- a/tests/integrationtests/DBusStandardInterfacesTests.cpp ++++ b/tests/integrationtests/DBusStandardInterfacesTests.cpp +@@ -201,7 +201,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesAddedSignalForAllObjectInterfaces) + , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties ) + { + EXPECT_THAT(objectPath, Eq(OBJECT_PATH)); ++#if LIBSYSTEMD_VERSION<=250 + EXPECT_THAT(interfacesAndProperties, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces ++#else ++ // Since systemd v251, ObjectManager standard interface is not listed among the interfaces ++ // if the object does not have object manager functionality explicitly enabled. ++ EXPECT_THAT(interfacesAndProperties, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces ++#endif + #if LIBSYSTEMD_VERSION<=244 + // Up to sd-bus v244, all properties are added to the list, i.e. `state', `action', and `blocking' in this case. + EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3)); +@@ -248,7 +254,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesRemovedSignalForAllObjectInterfaces) + , const std::vector<std::string>& interfaces ) + { + EXPECT_THAT(objectPath, Eq(OBJECT_PATH)); ++#if LIBSYSTEMD_VERSION<=250 + ASSERT_THAT(interfaces, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces ++#else ++ // Since systemd v251, ObjectManager standard interface is not listed among the interfaces ++ // if the object does not have object manager functionality explicitly enabled. ++ ASSERT_THAT(interfaces, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces ++#endif + signalReceived = true; + }; + +-- +2.39.1 |