Debug Syncthing crashes during testruns

This commit is contained in:
Martchus 2018-10-12 00:09:02 +02:00
parent 98a6b77013
commit db6c8af414
2 changed files with 156 additions and 83 deletions

View File

@ -32,10 +32,7 @@ private:
}; };
WaitForConnected::WaitForConnected(const SyncthingConnection &connection) WaitForConnected::WaitForConnected(const SyncthingConnection &connection)
: function<void(void)>([this] { : function<void(void)>([this] { m_connectedAgain = m_connectedAgain || m_connection.isConnected(); })
m_connectedAgain
|= m_connection.statusText() == QStringLiteral("connected") || m_connection.statusText() == QStringLiteral("connected, scanning");
})
, SignalInfo<decltype(&SyncthingConnection::statusChanged), function<void(void)>>( , SignalInfo<decltype(&SyncthingConnection::statusChanged), function<void(void)>>(
&connection, &SyncthingConnection::statusChanged, (*static_cast<const function<void(void)> *>(this)), &m_connectedAgain) &connection, &SyncthingConnection::statusChanged, (*static_cast<const function<void(void)> *>(this)), &m_connectedAgain)
, m_connection(connection) , m_connection(connection)
@ -65,7 +62,6 @@ public:
void testErrorCases(); void testErrorCases();
void testInitialConnection(); void testInitialConnection();
void testSendingError(); void testSendingError();
void waitForAllDirsAndDevsReady(bool initialConfig = false);
void checkDevices(); void checkDevices();
void checkDirectories() const; void checkDirectories() const;
void testReconnecting(); void testReconnecting();
@ -93,7 +89,9 @@ private:
template <typename Handler> TemporaryConnection handleNewDevices(Handler handler); template <typename Handler> TemporaryConnection handleNewDevices(Handler handler);
template <typename Handler> TemporaryConnection handleNewDirs(Handler handler); template <typename Handler> TemporaryConnection handleNewDirs(Handler handler);
WaitForConnected waitForConnected() const; WaitForConnected connectedSignal() const;
void waitForConnected(int timeout = 5000);
void waitForAllDirsAndDevsReady(bool initialConfig = false);
SyncthingConnection m_connection; SyncthingConnection m_connection;
QString m_ownDevId; QString m_ownDevId;
@ -156,32 +154,102 @@ void ConnectionTests::waitForConnection(Action action, int timeout, const Signal
waitForSignals(bind(action, &m_connection), timeout, signalInfos...); waitForSignals(bind(action, &m_connection), timeout, signalInfos...);
} }
/*!
* \brief Returns a SignalInfo for the test's connection.
*/
template <typename Signal, typename Handler> template <typename Signal, typename Handler>
SignalInfo<Signal, Handler> ConnectionTests::connectionSignal(Signal signal, const Handler &handler, bool *correctSignalEmitted) SignalInfo<Signal, Handler> ConnectionTests::connectionSignal(Signal signal, const Handler &handler, bool *correctSignalEmitted)
{ {
return SignalInfo<Signal, Handler>(&m_connection, signal, handler, correctSignalEmitted); return SignalInfo<Signal, Handler>(&m_connection, signal, handler, correctSignalEmitted);
} }
/*!
* \brief Returns the default connect() signal (no args) for the test's connection.
*/
void (SyncthingConnection::*ConnectionTests::defaultConnect())(void) void (SyncthingConnection::*ConnectionTests::defaultConnect())(void)
{ {
return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::connect); return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::connect);
} }
/*!
* \brief Returns the default reconnect() signal (no args) for the test's connection.
*/
void (SyncthingConnection::*ConnectionTests::defaultReconnect())(void) void (SyncthingConnection::*ConnectionTests::defaultReconnect())(void)
{ {
return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::reconnect); return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::reconnect);
} }
/*!
* \brief Returns the default disconnect() signal (no args) for the test's connection.
*/
void (SyncthingConnection::*ConnectionTests::defaultDisconnect())(void) void (SyncthingConnection::*ConnectionTests::defaultDisconnect())(void)
{ {
return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::disconnect); return static_cast<void (SyncthingConnection::*)(void)>(&SyncthingConnection::disconnect);
} }
WaitForConnected ConnectionTests::waitForConnected() const /*!
* \brief Returns a SignalInfo to wait until the connected (again).
*/
WaitForConnected ConnectionTests::connectedSignal() const
{ {
return WaitForConnected(m_connection); return WaitForConnected(m_connection);
} }
/*!
* \brief Waits until connected (again).
* \remarks
* - Does nothing if already connected.
* - Used to keep tests passing even though Syncthing dies and restarts during the testrun.
*/
void ConnectionTests::waitForConnected(int timeout)
{
waitForConnection(defaultConnect(), timeout, connectedSignal());
}
/*!
* \brief Ensures the connection is established and waits till all dirs and devs are ready.
* \param initialConfig Whether to check for initial config (at least one dir and one dev is paused).
*/
void ConnectionTests::waitForAllDirsAndDevsReady(const bool initialConfig)
{
bool allDirsReady, allDevsReady;
bool oneDirPaused = false, oneDevPaused = false;
bool isConnected = m_connection.isConnected();
const function<void()> checkAllDirsReady([this, &allDirsReady, &initialConfig, &oneDirPaused] {
for (const SyncthingDir &dir : m_connection.dirInfo()) {
if (dir.status == SyncthingDirStatus::Unknown) {
allDirsReady = false;
return;
}
oneDirPaused |= dir.paused;
}
allDirsReady = !initialConfig || oneDirPaused;
});
const function<void()> checkAllDevsReady([this, &allDevsReady, &initialConfig, &oneDevPaused] {
for (const SyncthingDev &dev : m_connection.devInfo()) {
if (dev.status == SyncthingDevStatus::Unknown) {
allDevsReady = false;
return;
}
oneDevPaused |= dev.paused;
}
allDevsReady = !initialConfig || oneDevPaused;
});
const function<void(SyncthingStatus)> checkStatus([this, &isConnected](SyncthingStatus) { isConnected = m_connection.isConnected(); });
checkAllDirsReady();
checkAllDevsReady();
if (allDirsReady && allDevsReady) {
return;
}
waitForSignalsOrFail(bind(defaultConnect(), &m_connection), 5000, connectionSignal(&SyncthingConnection::error),
connectionSignal(&SyncthingConnection::statusChanged, checkStatus, &isConnected),
connectionSignal(&SyncthingConnection::dirStatusChanged, checkAllDirsReady, &allDirsReady),
connectionSignal(&SyncthingConnection::newDirs, checkAllDirsReady, &allDirsReady),
connectionSignal(&SyncthingConnection::devStatusChanged, checkAllDevsReady, &allDevsReady),
connectionSignal(&SyncthingConnection::newDevices, checkAllDevsReady, &allDevsReady));
}
/*! /*!
* \brief Helps handling newDevices() signal when waiting for device change. * \brief Helps handling newDevices() signal when waiting for device change.
*/ */
@ -239,42 +307,65 @@ void ConnectionTests::testErrorCases()
CPPUNIT_ASSERT_EQUAL(QStringLiteral("Connection configuration is insufficient."), errorMessage); CPPUNIT_ASSERT_EQUAL(QStringLiteral("Connection configuration is insufficient."), errorMessage);
})); }));
cerr << "\n - Error handling in case of inavailability, wrong credentials and API key ..." << endl;
m_connection.setApiKey(QByteArray("wrong API key")); m_connection.setApiKey(QByteArray("wrong API key"));
bool syncthingAvailable = false, authError = false, apiKeyError = false; bool syncthingAvailable = false;
const function<void(const QString &errorMessage)> errorHandler bool authErrorStatus = false, authErrorConfig = false;
= [this, &syncthingAvailable, &authError, &apiKeyError](const QString &errorMessage) { bool apiKeyErrorStatus = false, apiKeyErrorConfig = false;
if (errorMessage == QStringLiteral("Unable to request Syncthing config: Connection refused") bool allErrorsEmitted = false;
|| errorMessage == QStringLiteral("Unable to request Syncthing status: Connection refused")) { const function<void(const QString &errorMessage)> errorHandler = [&](const QString &errorMessage) {
// Syncthing not ready yet, wait 100 ms till next connection attempt if ((errorMessage == QStringLiteral("Unable to request Syncthing status: Connection refused"))
wait(100); || (errorMessage == QStringLiteral("Unable to request Syncthing config: Connection refused"))) {
return; // Syncthing not ready yet, wait 100 ms till next connection attempt
} wait(100);
syncthingAvailable = true; return;
if (errorMessage == QStringLiteral("Unable to request Syncthing status: Host requires authentication") }
|| errorMessage == QStringLiteral("Unable to request Syncthing config: Host requires authentication")) { syncthingAvailable = true;
m_connection.setCredentials(QStringLiteral("nobody"), QStringLiteral("supersecret")); if (errorMessage == QStringLiteral("Unable to request Syncthing status: Host requires authentication")) {
authError = true; authErrorStatus = true;
return; return;
} }
if ((errorMessage.startsWith(QStringLiteral("Unable to request Syncthing status: Error transferring ")) if (errorMessage == QStringLiteral("Unable to request Syncthing config: Host requires authentication")) {
&& errorMessage.endsWith(QStringLiteral("/rest/system/status - server replied: Forbidden"))) authErrorConfig = true;
|| (errorMessage.startsWith(QStringLiteral("Unable to request Syncthing config: Error transferring ")) return;
&& errorMessage.endsWith(QStringLiteral("/rest/system/config - server replied: Forbidden")))) { }
m_connection.setApiKey(apiKey().toUtf8()); if ((errorMessage.startsWith(QStringLiteral("Unable to request Syncthing status: Error transferring "))
apiKeyError = true; && errorMessage.endsWith(QStringLiteral("/rest/system/status - server replied: Forbidden")))) {
return; m_connection.setApiKey(apiKey().toUtf8());
} apiKeyErrorStatus = true;
CPPUNIT_FAIL(argsToString("wrong error message: ", errorMessage.toLocal8Bit().data())); return;
}; }
while (!syncthingAvailable || !authError || !apiKeyError) { if ((errorMessage.startsWith(QStringLiteral("Unable to request Syncthing config: Error transferring "))
&& errorMessage.endsWith(QStringLiteral("/rest/system/config - server replied: Forbidden")))) {
apiKeyErrorConfig = true;
return;
}
allErrorsEmitted = authErrorStatus && authErrorConfig && apiKeyErrorStatus && apiKeyErrorConfig;
CPPUNIT_FAIL(argsToString("wrong error message: ", errorMessage.toLocal8Bit().data()));
};
cerr << "\n - Error handling in case of inavailability ..." << endl;
while (!syncthingAvailable) {
waitForConnection(defaultConnect(), 5000, connectionSignal(&SyncthingConnection::error, errorHandler)); waitForConnection(defaultConnect(), 5000, connectionSignal(&SyncthingConnection::error, errorHandler));
} }
cerr << "\n - Error handling in case of wrong credentials ..." << endl;
waitForConnection(defaultConnect(), 5000, connectionSignal(&SyncthingConnection::error, errorHandler));
while (!authErrorStatus || !authErrorConfig) {
waitForSignals(noop, 5000, connectionSignal(&SyncthingConnection::error, errorHandler));
}
cerr << "\n - Error handling in case of wrong API key ..." << endl;
m_connection.setCredentials(QStringLiteral("nobody"), QStringLiteral("supersecret"));
waitForConnection(defaultConnect(), 5000, connectionSignal(&SyncthingConnection::error, errorHandler));
while (!apiKeyErrorStatus || !apiKeyErrorConfig) {
waitForSignals(noop, 5000, connectionSignal(&SyncthingConnection::error, errorHandler));
}
} }
void ConnectionTests::testInitialConnection() void ConnectionTests::testInitialConnection()
{ {
cerr << "\n - Connecting initially ..." << endl; cerr << "\n - Connecting initially ..." << endl;
m_connection.setApiKey(apiKey().toUtf8());
waitForAllDirsAndDevsReady(true); waitForAllDirsAndDevsReady(true);
CPPUNIT_ASSERT_EQUAL_MESSAGE( CPPUNIT_ASSERT_EQUAL_MESSAGE(
"connected and paused (one dev is initially paused)", QStringLiteral("connected, paused"), m_connection.statusText()); "connected and paused (one dev is initially paused)", QStringLiteral("connected, paused"), m_connection.statusText());
@ -294,48 +385,6 @@ void ConnectionTests::testSendingError()
connectionSignal(&SyncthingConnection::newNotification, newNotificationHandler, &newNotificationEmitted)); connectionSignal(&SyncthingConnection::newNotification, newNotificationHandler, &newNotificationEmitted));
} }
/*!
* \brief Ensures the connection is established and waits till all dirs and devs are ready.
* \param initialConfig Whether to check for initial config (at least one dir and one dev is paused).
*/
void ConnectionTests::waitForAllDirsAndDevsReady(const bool initialConfig)
{
bool allDirsReady, allDevsReady;
bool oneDirPaused = false, oneDevPaused = false;
bool isConnected = m_connection.isConnected();
const function<void()> checkAllDirsReady([this, &allDirsReady, &initialConfig, &oneDirPaused] {
for (const SyncthingDir &dir : m_connection.dirInfo()) {
if (dir.status == SyncthingDirStatus::Unknown) {
allDirsReady = false;
return;
}
oneDirPaused |= dir.paused;
}
allDirsReady = !initialConfig || oneDirPaused;
});
const function<void()> checkAllDevsReady([this, &allDevsReady, &initialConfig, &oneDevPaused] {
for (const SyncthingDev &dev : m_connection.devInfo()) {
if (dev.status == SyncthingDevStatus::Unknown) {
allDevsReady = false;
return;
}
oneDevPaused |= dev.paused;
}
allDevsReady = !initialConfig || oneDevPaused;
});
const function<void(SyncthingStatus)> checkStatus([this, &isConnected](SyncthingStatus) { isConnected = m_connection.isConnected(); });
checkAllDirsReady();
checkAllDevsReady();
if (allDirsReady && allDevsReady) {
return;
}
waitForSignals(bind(defaultConnect(), &m_connection), 5000, connectionSignal(&SyncthingConnection::statusChanged, checkStatus, &isConnected),
connectionSignal(&SyncthingConnection::dirStatusChanged, checkAllDirsReady, &allDirsReady),
connectionSignal(&SyncthingConnection::newDirs, checkAllDirsReady, &allDirsReady),
connectionSignal(&SyncthingConnection::devStatusChanged, checkAllDevsReady, &allDevsReady),
connectionSignal(&SyncthingConnection::newDevices, checkAllDevsReady, &allDevsReady));
}
void ConnectionTests::checkDevices() void ConnectionTests::checkDevices()
{ {
const auto &devInfo = m_connection.devInfo(); const auto &devInfo = m_connection.devInfo();
@ -427,14 +476,21 @@ void ConnectionTests::testResumingAllDevices()
devResumed = true; devResumed = true;
} }
}; };
const function<void(const std::vector<SyncthingDev>)> newDevsHandler = [&devResumedHandler](const std::vector<SyncthingDev> &devs) {
for (const auto &dev : devs) {
devResumedHandler(dev, 0);
}
};
const function<void(const QStringList &)> devResumedTriggeredHandler const function<void(const QStringList &)> devResumedTriggeredHandler
= [this](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(m_connection.deviceIds(), devIds); }; = [this](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(m_connection.deviceIds(), devIds); };
const auto newDevsConnection = handleNewDevices(devResumedHandler); const auto newDevsConnection = handleNewDevices(devResumedHandler);
waitForConnection(&SyncthingConnection::resumeAllDevs, 7500, waitForConnected(), waitForConnected();
waitForConnection(&SyncthingConnection::resumeAllDevs, 7500, connectedSignal(),
connectionSignal(&SyncthingConnection::devStatusChanged, devResumedHandler, &devResumed), connectionSignal(&SyncthingConnection::devStatusChanged, devResumedHandler, &devResumed),
connectionSignal(&SyncthingConnection::newDevices, newDevsHandler, &devResumed),
connectionSignal(&SyncthingConnection::deviceResumeTriggered, devResumedTriggeredHandler)); connectionSignal(&SyncthingConnection::deviceResumeTriggered, devResumedTriggeredHandler));
CPPUNIT_ASSERT(devResumed); CPPUNIT_ASSERT(devResumed);
for (const QJsonValue &devValue : m_connection.m_rawConfig.value(QStringLiteral("devices")).toArray()) { for (const QJsonValueRef devValue : m_connection.m_rawConfig.value(QStringLiteral("devices")).toArray()) {
const QJsonObject &devObj(devValue.toObject()); const QJsonObject &devObj(devValue.toObject());
CPPUNIT_ASSERT(!devObj.isEmpty()); CPPUNIT_ASSERT(!devObj.isEmpty());
CPPUNIT_ASSERT_MESSAGE("raw config updated accordingly", !devObj.value(QStringLiteral("paused")).toBool(true)); CPPUNIT_ASSERT_MESSAGE("raw config updated accordingly", !devObj.value(QStringLiteral("paused")).toBool(true));
@ -451,11 +507,18 @@ void ConnectionTests::testResumingDirectory()
dirResumed = true; dirResumed = true;
} }
}; };
const function<void(const std::vector<SyncthingDir>)> newDirsHandler = [&dirResumedHandler](const std::vector<SyncthingDir> &dirs) {
for (const auto &dir : dirs) {
dirResumedHandler(dir, 0);
}
};
const function<void(const QStringList &)> dirResumedTriggeredHandler const function<void(const QStringList &)> dirResumedTriggeredHandler
= [this](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(m_connection.directoryIds(), devIds); }; = [this](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(m_connection.directoryIds(), devIds); };
const auto newDirsConnection = handleNewDirs(dirResumedHandler); const auto newDirsConnection = handleNewDirs(dirResumedHandler);
waitForConnection(&SyncthingConnection::resumeAllDirs, 7500, waitForConnected(), waitForConnected();
waitForConnection(&SyncthingConnection::resumeAllDirs, 7500, connectedSignal(),
connectionSignal(&SyncthingConnection::dirStatusChanged, dirResumedHandler, &dirResumed), connectionSignal(&SyncthingConnection::dirStatusChanged, dirResumedHandler, &dirResumed),
connectionSignal(&SyncthingConnection::newDirs, newDirsHandler, &dirResumed),
connectionSignal(&SyncthingConnection::directoryResumeTriggered, dirResumedTriggeredHandler)); connectionSignal(&SyncthingConnection::directoryResumeTriggered, dirResumedTriggeredHandler));
CPPUNIT_ASSERT(dirResumed); CPPUNIT_ASSERT(dirResumed);
CPPUNIT_ASSERT_EQUAL_MESSAGE("still 2 dirs present", 2_st, m_connection.dirInfo().size()); CPPUNIT_ASSERT_EQUAL_MESSAGE("still 2 dirs present", 2_st, m_connection.dirInfo().size());
@ -474,7 +537,8 @@ void ConnectionTests::testPausingDirectory()
const QStringList ids({ QStringLiteral("test1") }); const QStringList ids({ QStringLiteral("test1") });
const function<void(const QStringList &)> dirPausedTriggeredHandler = [&ids](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(ids, devIds); }; const function<void(const QStringList &)> dirPausedTriggeredHandler = [&ids](const QStringList &devIds) { CPPUNIT_ASSERT_EQUAL(ids, devIds); };
const auto newDirsConnection = handleNewDirs(dirPausedHandler); const auto newDirsConnection = handleNewDirs(dirPausedHandler);
waitForSignals(bind(&SyncthingConnection::pauseDirectories, &m_connection, ids), 7500, waitForConnected(), waitForConnected();
waitForSignals(bind(&SyncthingConnection::pauseDirectories, &m_connection, ids), 7500, connectedSignal(),
connectionSignal(&SyncthingConnection::dirStatusChanged, dirPausedHandler, &dirPaused), connectionSignal(&SyncthingConnection::dirStatusChanged, dirPausedHandler, &dirPaused),
connectionSignal(&SyncthingConnection::directoryPauseTriggered, dirPausedTriggeredHandler)); connectionSignal(&SyncthingConnection::directoryPauseTriggered, dirPausedTriggeredHandler));
CPPUNIT_ASSERT(dirPaused); CPPUNIT_ASSERT(dirPaused);
@ -485,6 +549,7 @@ void ConnectionTests::testPausingDirectory()
void ConnectionTests::testRequestingLog() void ConnectionTests::testRequestingLog()
{ {
cerr << "\n - Requesting log ..." << endl; cerr << "\n - Requesting log ..." << endl;
waitForConnected();
// timeout after 1 second // timeout after 1 second
QTimer timeout; QTimer timeout;
@ -513,6 +578,7 @@ void ConnectionTests::testRequestingLog()
void ConnectionTests::testRequestingQrCode() void ConnectionTests::testRequestingQrCode()
{ {
cerr << "\n - Requesting QR-Code for own device ID ..." << endl; cerr << "\n - Requesting QR-Code for own device ID ..." << endl;
waitForConnected();
// timeout after 2 seconds // timeout after 2 seconds
QTimer timeout; QTimer timeout;
@ -520,6 +586,7 @@ void ConnectionTests::testRequestingQrCode()
timeout.setInterval(SYNCTHINGTESTHELPER_TIMEOUT(5000)); timeout.setInterval(SYNCTHINGTESTHELPER_TIMEOUT(5000));
QEventLoop loop; QEventLoop loop;
QObject::connect(&timeout, &QTimer::timeout, &loop, &QEventLoop::quit); QObject::connect(&timeout, &QTimer::timeout, &loop, &QEventLoop::quit);
QObject::connect(&m_connection, &SyncthingConnection::error, &loop, &QEventLoop::quit);
bool callbackOk = false; bool callbackOk = false;
const auto request = m_connection.requestQrCode(m_ownDevId, [&callbackOk, &loop](const QByteArray &data) { const auto request = m_connection.requestQrCode(m_ownDevId, [&callbackOk, &loop](const QByteArray &data) {
@ -531,8 +598,8 @@ void ConnectionTests::testRequestingQrCode()
timeout.start(); timeout.start();
loop.exec(); loop.exec();
QObject::disconnect(request); // ensure callback is not called after return (in error case) QObject::disconnect(request); // ensure callback is not called after return (in error case)
CPPUNIT_ASSERT_MESSAGE( CPPUNIT_ASSERT_MESSAGE(argsToString("QR code returned before an error occurred or timeout of ", timeout.interval(),
argsToString("QR code returned before timeout of ", timeout.interval(), " ms (set SYNCTHING_TEST_TIMEOUT_FACTOR to increase timeout)"), " ms (set SYNCTHING_TEST_TIMEOUT_FACTOR to increase timeout)"),
callbackOk); callbackOk);
} }
@ -562,6 +629,7 @@ void ConnectionTests::testConnectingWithSettings()
void ConnectionTests::testRequestingRescan() void ConnectionTests::testRequestingRescan()
{ {
cerr << "\n - Requesting rescan ..." << endl; cerr << "\n - Requesting rescan ..." << endl;
waitForConnected();
bool rescanTriggered = false; bool rescanTriggered = false;
function<void(const QString &)> rescanTriggeredHandler = [&rescanTriggered](const QString &dir) { function<void(const QString &)> rescanTriggeredHandler = [&rescanTriggered](const QString &dir) {
@ -583,6 +651,7 @@ void ConnectionTests::testRequestingRescan()
void ConnectionTests::testDealingWithArbitraryConfig() void ConnectionTests::testDealingWithArbitraryConfig()
{ {
cerr << "\n - Changing arbitrary config ..." << endl; cerr << "\n - Changing arbitrary config ..." << endl;
waitForConnected();
// read some value, eg. options.relayReconnectIntervalM // read some value, eg. options.relayReconnectIntervalM
auto rawConfig(m_connection.rawConfig()); auto rawConfig(m_connection.rawConfig());
@ -607,6 +676,7 @@ void ConnectionTests::testDealingWithArbitraryConfig()
}); });
// post new config // post new config
waitForConnected();
waitForSignalsOrFail(bind(&SyncthingConnection::postConfigFromJsonObject, &m_connection, ref(rawConfig)), 10000, waitForSignalsOrFail(bind(&SyncthingConnection::postConfigFromJsonObject, &m_connection, ref(rawConfig)), 10000,
connectionSignal(&SyncthingConnection::error), connectionSignal(&SyncthingConnection::newConfigTriggered), connectionSignal(&SyncthingConnection::error), connectionSignal(&SyncthingConnection::newConfigTriggered),
connectionSignal(&SyncthingConnection::newConfig, handleNewConfig, &hasNewConfig)); connectionSignal(&SyncthingConnection::newConfig, handleNewConfig, &hasNewConfig));

View File

@ -107,6 +107,9 @@ void SyncthingTestInstance::stop()
if (!stdErr.isEmpty()) { if (!stdErr.isEmpty()) {
cerr << "\n - Syncthing stderr during the testrun:\n" << stdErr.data(); cerr << "\n - Syncthing stderr during the testrun:\n" << stdErr.data();
} }
cerr << "\n - Syncthing (re)started: " << stdOut.count("INFO: Starting syncthing") << " times";
cerr << "\n - Syncthing exited: " << stdOut.count("INFO: Syncthing exited: exit status") << " times";
cerr << "\n - Syncthing panicked: " << stdOut.count("WARNING: Panic detected") << " times";
} }
} }
} // namespace TestUtilities } // namespace TestUtilities