Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rescanning part of connection tests

This commit is contained in:
Martchus 2017-08-21 01:01:20 +02:00
parent cc6fec91c1
commit ed1b13d43e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
connector/tests/connectiontests.cpp
View File

@ -558,12 +558,14 @@ void ConnectionTests::testRequestingRescan()
CPPUNIT_ASSERT_EQUAL(QStringLiteral("test2"), dir);
rescanTriggered = true;
};
waitForSignals(bind(&SyncthingConnection::rescanAllDirs, &m_connection), 5000,
connectionSignal(&SyncthingConnection::rescanTriggered, rescanTriggeredHandler, &rescanTriggered));
bool errorOccured = false;
function<void(const QString &)> errorHandler = [&errorOccured](const QString &message) {
errorOccured |= message.startsWith(QStringLiteral("Unable to request rescan: Error transferring"))
&& message.endsWith(QStringLiteral("/rest/db/scan?folder=test1 - server replied: Internal Server Error"));
&& message.endsWith(QStringLiteral("/rest/db/scan?folder=non-existing-dir&sub=sub/path - server replied: Internal Server Error"));
};
waitForSignals(bind(&SyncthingConnection::rescanAllDirs, &m_connection), 5000,
connectionSignal(&SyncthingConnection::rescanTriggered, rescanTriggeredHandler, &rescanTriggered),
waitForSignals(bind(&SyncthingConnection::rescan, &m_connection, QStringLiteral("non-existing-dir"), QStringLiteral("sub/path")), 5000,
connectionSignal(&SyncthingConnection::error, errorHandler, &errorOccured));
}