feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

Skip GetMachineId test when /etc/machine-id is not available

Browse Source
This commit is contained in:
sangelovic
2019-10-11 15:56:00 +02:00
parent 0440dcb15b
commit c6d4d2710f
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integrationtests/AdaptorAndProxy_test.cpp
View File

@ -43,6 +43,8 @@
#include <fstream> #include <fstream>
#include <future> #include <future>
#include <unistd.h>
using ::testing::Eq; using ::testing::Eq;
using ::testing::DoubleEq; using ::testing::DoubleEq;
using ::testing::Gt; using ::testing::Gt;
@ -431,6 +433,13 @@ TEST_F(SdbusTestObject, PingsViaPeerInterface)
TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInterface) TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInterface)
{ {
// If /etc/machine-id does not exist in your system (which is very likely because you have
// a non-systemd Linux), org.freedesktop.DBus.Peer.GetMachineId() will not work. To solve
// this, you can create /etc/machine-id yourself as symlink to /var/lib/dbus/machine-id,
// and then org.freedesktop.DBus.Peer.GetMachineId() will start to work.
if (::access("/etc/machine-id", F_OK) == -1)
GTEST_SKIP() << "/etc/machine-id file does not exist, GetMachineId() will not work";
ASSERT_NO_THROW(m_proxy->GetMachineId()); ASSERT_NO_THROW(m_proxy->GetMachineId());
} }