From d0f0047daa9fb7ca07fc5a0b3aae5e57403b46d2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 1 May 2022 20:53:13 +0300 Subject: [PATCH] ksysguard: adjust ksysguardd test to kdelibs changes for reference: https://github.com/fluxer/kdelibs/commit/107a01f0e05712fd10089f3f2322b13e21d3d127 Signed-off-by: Ivailo Monev --- ksysguard/gui/tests/ksysguarddtest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ksysguard/gui/tests/ksysguarddtest.cpp b/ksysguard/gui/tests/ksysguarddtest.cpp index acc0e278..82f794d3 100644 --- a/ksysguard/gui/tests/ksysguarddtest.cpp +++ b/ksysguard/gui/tests/ksysguarddtest.cpp @@ -1,11 +1,13 @@ #include "ksysguarddtest.h" #include -#include +#include KSGRD::SensorAgent *agent; Q_DECLARE_METATYPE(KSGRD::SensorAgent *) +static const QString ksysguarddexe = KStandardDirs::findExe("ksysguardd"); + using namespace KSGRD; void TestKsysguardd::initTestCase() { @@ -14,7 +16,7 @@ void TestKsysguardd::initTestCase() hostConnectionLostSpy = new QSignalSpy(&manager, SIGNAL(hostConnectionLost(QString))); updateSpy = new QSignalSpy(&manager, SIGNAL(update())); hostAddedSpy = new QSignalSpy(&manager, SIGNAL(hostAdded(KSGRD::SensorAgent*,QString))); - bool success = manager.engage("", "", "../../ksysguardd/ksysguardd", -1); + bool success = manager.engage("", "", ksysguarddexe, -1); QCOMPARE(hostAddedSpy->count(), 1); QVERIFY(success); QVERIFY(manager.isConnected("")); @@ -50,7 +52,7 @@ void TestKsysguardd::testSetup() bool success = manager.hostInfo("", shell, command, port ); QCOMPARE(success, true); QCOMPARE(shell, QString("")); - QCOMPARE(command, QString("../../ksysguardd/ksysguardd")); + QCOMPARE(command, ksysguarddexe); QCOMPARE(port, -1); success = manager.hostInfo("nonexistant host", shell, command, port );