generated from general-packages/pika-pkg-template
ferreo
4c67742b4d
Some checks failed
PikaOS Package Build & Release (amd64-v3) / build (push) Failing after 39s
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
From: Shengjing Zhu <zhsj@debian.org>
|
|
Date: Fri, 10 Nov 2023 17:32:33 +0800
|
|
Subject: skip GetMachineId test when /etc/machine-id doesn't exist
|
|
|
|
Not sure why test fails when /var/lib/dbus/machine-id
|
|
exists but /etc/machine-id not.
|
|
---
|
|
tests/integrationtests/DBusStandardInterfacesTests.cpp | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/integrationtests/DBusStandardInterfacesTests.cpp b/tests/integrationtests/DBusStandardInterfacesTests.cpp
|
|
index e648fac..2ba9d62 100644
|
|
--- a/tests/integrationtests/DBusStandardInterfacesTests.cpp
|
|
+++ b/tests/integrationtests/DBusStandardInterfacesTests.cpp
|
|
@@ -61,9 +61,8 @@ TEST_F(SdbusTestObject, PingsViaPeerInterface)
|
|
|
|
TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInterface)
|
|
{
|
|
- if (::access("/etc/machine-id", F_OK) == -1 &&
|
|
- ::access("/var/lib/dbus/machine-id", F_OK) == -1)
|
|
- GTEST_SKIP() << "/etc/machine-id and /var/lib/dbus/machine-id files do not exist, GetMachineId() will not work";
|
|
+ if (::access("/etc/machine-id", F_OK) == -1 )
|
|
+ GTEST_SKIP() << "/etc/machine-id files do not exist, GetMachineId() will not work";
|
|
|
|
ASSERT_NO_THROW(m_proxy->GetMachineId());
|
|
}
|