From ef1b7b2c212deb5d61af7db83bf6b18b79cdf82e Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 20 Jun 2016 17:54:22 +0200
Subject: [PATCH] Use QSKIP to flag a test 'skipped', if server is not
 reachable

refs #682
---
 tests/blackcore/testnetwork.cpp | 7 ++-----
 tests/blackcore/testreaders.cpp | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/blackcore/testnetwork.cpp b/tests/blackcore/testnetwork.cpp
index 5ed42f23e..ca6f1031a 100644
--- a/tests/blackcore/testnetwork.cpp
+++ b/tests/blackcore/testnetwork.cpp
@@ -47,11 +47,7 @@ namespace BlackCoreTest
     void CTestNetwork::networkTest(BlackCore::INetwork *net)
     {
         CServer fsdServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456"));
-        if (!this->pingServer(fsdServer))
-        {
-            qWarning() << "Skipping unit test because fsd server is not reachable.";
-            return;
-        }
+        if (!this->pingServer(fsdServer)) { QSKIP("Server not reachable."); }
 
         QString string = net->connectionStatusToString(INetwork::Connected);
         QVERIFY(string == "Connected");
@@ -109,6 +105,7 @@ namespace BlackCoreTest
         CUrl url(server.getAddress(), server.getPort());
         if (!CNetworkUtils::canConnect(url, m, 2500))
         {
+            qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected";
             return false;
         }
         return true;
diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp
index d8c7fdf8d..93650290f 100644
--- a/tests/blackcore/testreaders.cpp
+++ b/tests/blackcore/testreaders.cpp
@@ -57,7 +57,7 @@ namespace BlackCoreTest
     void CTestReaders::readIcaoData()
     {
         const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl());
-        if (!this->pingServer(url)) { return; }
+        if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
         m_icaoReader->start();
         m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime());
 
@@ -86,7 +86,7 @@ namespace BlackCoreTest
     void CTestReaders::readModelData()
     {
         const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl());
-        if (!this->pingServer(url)) { return; }
+        if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
         m_modelReader->start();
         m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime());