Merge PR #724: Stabalize verify action exectued tests

This commit is contained in:
jenkins 2026-01-19 10:09:51 +01:00
commit 66d35fdc78

View File

@ -318,18 +318,12 @@ void TestLogging::actionLog()
// EXECUTE with params
QVariant response = injectAndWait("Integrations.ExecuteAction", params);
// wait for the outgoing data
// 3 packets: ExecuteAction reply, LogDatabaseUpdated signal and LogEntryAdded signal
while (clientSpy.count() < 3) {
bool success = clientSpy.wait();
if (!success) {
break;
}
}
QVariantList logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
QVariantList logEntryAddedVariants;
QTRY_VERIFY_WITH_TIMEOUT([&]() {
logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
return !logEntryAddedVariants.isEmpty();
}(), 5000);
qWarning() << QJsonDocument::fromVariant(logEntryAddedVariants).toJson();
QVERIFY2(!logEntryAddedVariants.isEmpty(), "Did not get Logging.LogEntryAdded notification.");
bool found = false;
foreach (const QVariant &loggEntryAddedVariant, logEntryAddedVariants) {
@ -354,10 +348,10 @@ void TestLogging::actionLog()
params.insert("thingId", m_mockThingId);
response = injectAndWait("Integrations.ExecuteAction", params);
clientSpy.wait();
logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
QVERIFY(!logEntryAddedVariants.isEmpty());
QTRY_VERIFY_WITH_TIMEOUT([&]() {
logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
return !logEntryAddedVariants.isEmpty();
}(), 5000);
// get this logentry with filter
params.clear();
@ -373,10 +367,10 @@ void TestLogging::actionLog()
params.insert("thingId", m_mockThingId);
response = injectAndWait("Integrations.ExecuteAction", params);
clientSpy.wait();
logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
QVERIFY2(!logEntryAddedVariants.isEmpty(), "Did not get Logging.LogEntryAdded notification.");
QTRY_VERIFY_WITH_TIMEOUT([&]() {
logEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
return !logEntryAddedVariants.isEmpty();
}(), 5000);
found = false;
foreach (const QVariant &loggEntryAddedVariant, logEntryAddedVariants) {
@ -473,4 +467,3 @@ void TestLogging::removeThing()
#include "testlogging.moc"
QTEST_MAIN(TestLogging)