stabilize test logging
This commit is contained in:
parent
7b1c848c07
commit
6341ce2455
@ -144,14 +144,19 @@ void TestLogging::systemLogs()
|
|||||||
QVariantList logEntries = response.toMap().value("params").toMap().value("logEntries").toList();
|
QVariantList logEntries = response.toMap().value("params").toMap().value("logEntries").toList();
|
||||||
QVERIFY(logEntries.count() == 2);
|
QVERIFY(logEntries.count() == 2);
|
||||||
|
|
||||||
QVariantMap logEntryShutdown = logEntries.first().toMap();
|
QVariantMap logEntryStartup = logEntries.first().toMap();
|
||||||
|
QVariantMap logEntryShutdown = logEntries.last().toMap();
|
||||||
|
// We cannot rely on the order those events
|
||||||
|
if (!logEntryStartup.value("active").toBool()) {
|
||||||
|
logEntryStartup = logEntries.last().toMap();
|
||||||
|
logEntryShutdown = logEntries.first().toMap();
|
||||||
|
}
|
||||||
|
|
||||||
QCOMPARE(logEntryShutdown.value("active").toBool(), false);
|
QCOMPARE(logEntryShutdown.value("active").toBool(), false);
|
||||||
QCOMPARE(logEntryShutdown.value("eventType").toString(), JsonTypes::loggingEventTypeToString(Logging::LoggingEventTypeActiveChange));
|
QCOMPARE(logEntryShutdown.value("eventType").toString(), JsonTypes::loggingEventTypeToString(Logging::LoggingEventTypeActiveChange));
|
||||||
QCOMPARE(logEntryShutdown.value("source").toString(), JsonTypes::loggingSourceToString(Logging::LoggingSourceSystem));
|
QCOMPARE(logEntryShutdown.value("source").toString(), JsonTypes::loggingSourceToString(Logging::LoggingSourceSystem));
|
||||||
QCOMPARE(logEntryShutdown.value("loggingLevel").toString(), JsonTypes::loggingLevelToString(Logging::LoggingLevelInfo));
|
QCOMPARE(logEntryShutdown.value("loggingLevel").toString(), JsonTypes::loggingLevelToString(Logging::LoggingLevelInfo));
|
||||||
|
|
||||||
QVariantMap logEntryStartup = logEntries.last().toMap();
|
|
||||||
|
|
||||||
QCOMPARE(logEntryStartup.value("active").toBool(), true);
|
QCOMPARE(logEntryStartup.value("active").toBool(), true);
|
||||||
QCOMPARE(logEntryStartup.value("eventType").toString(), JsonTypes::loggingEventTypeToString(Logging::LoggingEventTypeActiveChange));
|
QCOMPARE(logEntryStartup.value("eventType").toString(), JsonTypes::loggingEventTypeToString(Logging::LoggingEventTypeActiveChange));
|
||||||
|
|||||||
Reference in New Issue
Block a user