flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use QSKIP to flag a test 'skipped', if server is not reachable

Browse Source 
refs #682
This commit is contained in:
Roland Winklmeier
2016-06-20 17:54:22 +02:00
parent fdfc5256eb
commit ef1b7b2c21
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/blackcore/testnetwork.cpp
View File

@@ -47,11 +47,7 @@ namespace BlackCoreTest
void CTestNetwork::networkTest(BlackCore::INetwork *net) void CTestNetwork::networkTest(BlackCore::INetwork *net)
{ {
CServer fsdServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456")); CServer fsdServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456"));
if (!this->pingServer(fsdServer)) if (!this->pingServer(fsdServer)) { QSKIP("Server not reachable."); }
{
qWarning() << "Skipping unit test because fsd server is not reachable.";
return;
}
QString string = net->connectionStatusToString(INetwork::Connected); QString string = net->connectionStatusToString(INetwork::Connected);
QVERIFY(string == "Connected"); QVERIFY(string == "Connected");
@@ -109,6 +105,7 @@ namespace BlackCoreTest
CUrl url(server.getAddress(), server.getPort()); CUrl url(server.getAddress(), server.getPort());
if (!CNetworkUtils::canConnect(url, m, 2500)) if (!CNetworkUtils::canConnect(url, m, 2500))
{ {
qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected";
return false; return false;
} }
return true; return true;

4
tests/blackcore/testreaders.cpp
View File

@@ -57,7 +57,7 @@ namespace BlackCoreTest
void CTestReaders::readIcaoData() void CTestReaders::readIcaoData()
{ {
const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl()); const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl());
if (!this->pingServer(url)) { return; } if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
m_icaoReader->start(); m_icaoReader->start();
m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime()); m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime());
@@ -86,7 +86,7 @@ namespace BlackCoreTest
void CTestReaders::readModelData() void CTestReaders::readModelData()
{ {
const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl()); const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl());
if (!this->pingServer(url)) { return; } if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
m_modelReader->start(); m_modelReader->start();
m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime()); m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime());