tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Lan Link Provider Test

Browse source 
Pairing timer was started even when pair package sending is failed, fixed that
This commit is contained in:
Vineet Garg 2015-09-13 01:45:19 +05:30
parent 67a2c1ffd9
commit 73a80f0296
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/backends/lan/lanpairinghandler.cpp
View file

@ -145,8 +145,10 @@ bool LanPairingHandler::requestPairing()
createPairPackage(np); createPairPackage(np);
bool success; bool success;
success = m_deviceLink->sendPackage(np); success = m_deviceLink->sendPackage(np);
if (success) m_pairStatus = PairStatus::Requested; if (success) {
m_pairingTimeout.start(); m_pairStatus = PairStatus::Requested;
m_pairingTimeout.start();
}
return success; return success;
} }

4
tests/lanlinkprovidertest.cpp
View file

@ -181,7 +181,7 @@ void LanLinkProviderTest::pairedDeviceUdpPackageReceived()
serverSocket->setPeerVerifyMode(QSslSocket::VerifyPeer); serverSocket->setPeerVerifyMode(QSslSocket::VerifyPeer);
serverSocket->setPeerVerifyName(kcc->deviceId()); serverSocket->setPeerVerifyName(kcc->deviceId());
serverSocket->startServerEncryption(); // Its TCP server. but SSL client serverSocket->startClientEncryption(); // Its TCP server. but SSL client
QVERIFY(!serverSocket->isEncrypted()); QVERIFY(!serverSocket->isEncrypted());
spy3.wait(2000); spy3.wait(2000);
qDebug() << "xxxxxxxxx" << serverSocket->sslErrors(); qDebug() << "xxxxxxxxx" << serverSocket->sslErrors();
@ -235,7 +235,7 @@ void LanLinkProviderTest::unpairedDeviceTcpPackageReceived()
setSocketAttributes(&socket); setSocketAttributes(&socket);
socket.setPeerVerifyMode(QSslSocket::QueryPeer); socket.setPeerVerifyMode(QSslSocket::QueryPeer);
socket.startClientEncryption(); socket.startServerEncryption();
QVERIFY(spy3.wait()); QVERIFY(spy3.wait());