ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make testes not parallel

Browse Source
This commit is contained in:
Simon Stürz 2025-08-13 10:04:22 +02:00
parent 2acf7784a6
commit aa59ddd714
8 changed files with 1354 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian-qt5/rules
View File

@ -52,7 +52,7 @@ override_dh_missing:
dh_missing --list-missing dh_missing --list-missing
override_dh_auto_test: override_dh_auto_test:
dh_auto_test -- -k TESTARGS="-m 600 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task" dh_auto_test --no-parallel -- -k TESTARGS="-m 600 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task"
override_dh_installsystemd: override_dh_installsystemd:
dh_installsystemd --restart-after-upgrade dh_installsystemd --restart-after-upgrade

1
debian-qt6/changelog
View File

@ -1 +0,0 @@
../debian-qt5/changelog

1345
debian-qt6/changelog Normal file
View File

File diff suppressed because it is too large Load Diff

2
debian-qt6/rules
View File

@ -52,7 +52,7 @@ override_dh_missing:
dh_missing --list-missing dh_missing --list-missing
override_dh_auto_test: override_dh_auto_test:
dh_auto_test -- -k TESTARGS="-m 600 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task" dh_auto_test --no-parallel -- -k TESTARGS="-m 600 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task"
override_dh_installsystemd: override_dh_installsystemd:
dh_installsystemd --restart-after-upgrade dh_installsystemd --restart-after-upgrade

1
libnymea-core/hardware/bluetoothlowenergy/nymeabluetoothagent.cpp
View File

@ -1,5 +1,6 @@
#include "nymeabluetoothagent.h" #include "nymeabluetoothagent.h"
#include <QString>
#include <QDBusConnection> #include <QDBusConnection>
#include <QLoggingCategory> #include <QLoggingCategory>

1
libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.cpp
View File

@ -30,7 +30,6 @@
#include "modbusrtuhardwareresourceimplementation.h" #include "modbusrtuhardwareresourceimplementation.h"
#include "loggingcategories.h" #include "loggingcategories.h"
#include "nymeasettings.h"
#include "hardware/modbus/modbusrtumanager.h" #include "hardware/modbus/modbusrtumanager.h"
NYMEA_LOGGING_CATEGORY(dcModbusRtuResource, "ModbusRtuResource") NYMEA_LOGGING_CATEGORY(dcModbusRtuResource, "ModbusRtuResource")

5
libnymea/jsonrpc/jsonhandler.cpp
View File

@ -192,8 +192,6 @@ void JsonHandler::registerObject(const QMetaObject &metaObject)
for (int i = 0; i < metaObject.propertyCount(); i++) { for (int i = 0; i < metaObject.propertyCount(); i++) {
QMetaProperty metaProperty = metaObject.property(i); QMetaProperty metaProperty = metaObject.property(i);
QString name = metaProperty.name(); QString name = metaProperty.name();
// if (className == "Thing")
// qCDebug(dcJsonRpc()) << "Thing!" << metaProperty.isUser() << metaProperty.isWritable() << metaProperty.revision();
if (name == "objectName") { if (name == "objectName") {
continue; // Skip QObject's objectName property continue; // Skip QObject's objectName property
@ -323,7 +321,8 @@ QVariant JsonHandler::pack(const QMetaObject &metaObject, const void *value) con
} }
QVariant propertyValue = metaProperty.readOnGadget(value); QVariant propertyValue = metaProperty.readOnGadget(value);
qCDebug(dcJsonRpc()) << metaProperty.name() << "optional:" << metaProperty.isUser() << "value:" << propertyValue << "valid:" << propertyValue.isValid() << "null:" << propertyValue.isNull(); // qCDebug(dcJsonRpc()) << metaProperty.name() << "optional:" << metaProperty.isUser()
// << "value:" << propertyValue << "valid:" << propertyValue.isValid() << "null:" << propertyValue.isNull();
// If it's optional and empty, we may skip it // If it's optional and empty, we may skip it
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)

3
libnymea/network/zeroconf/zeroconfserviceentry.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2020, nymea GmbH * Copyright 2013 - 2025, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -31,6 +31,7 @@
#ifndef ZEROCONFSERVICEENTRY_H #ifndef ZEROCONFSERVICEENTRY_H
#define ZEROCONFSERVICEENTRY_H #define ZEROCONFSERVICEENTRY_H
#include <QDebug>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QHostAddress> #include <QHostAddress>

5
tests/auto/webserver/testwebserver.cpp
View File

@ -414,7 +414,7 @@ void TestWebserver::getIcons()
QFETCH(int, iconSize); QFETCH(int, iconSize);
QNetworkAccessManager nam; QNetworkAccessManager nam;
connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply* reply, const QList<QSslError> &) { connect(&nam, &QNetworkAccessManager::sslErrors, [](QNetworkReply* reply, const QList<QSslError> &) {
reply->ignoreSslErrors(); reply->ignoreSslErrors();
}); });
QSignalSpy clientSpy(&nam, &QNetworkAccessManager::finished); QSignalSpy clientSpy(&nam, &QNetworkAccessManager::finished);
@ -623,8 +623,7 @@ void TestWebserver::getDebugServer()
reply = nam.put(request, ""); reply = nam.put(request, "");
} }
clientSpy.wait(1000); clientSpy.wait();
qCCritical(dcTests()) << reply->isFinished() << reply->isRunning() << clientSpy.count();
QVERIFY2(clientSpy.count() == 1, "expected exactly 1 response from webserver"); QVERIFY2(clientSpy.count() == 1, "expected exactly 1 response from webserver");
ok = false; ok = false;