Skip instead of fail tests when test server is not available

We were being inconsistent in how we handled this, some tests skipping
while others using QVERIFY. It makes more sense to skip the tests, since
the problem is a missing pre-condition of the test, not the test itself
being bad or exposing real failures in the implementation.

Change-Id: I20eacfe12dbce0b0d926e48cbe2d2772819fa4a5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

2 files changed, 61 insertions, 0 deletions

diff --git a/tests/auto/network/selftest/selftest.pro b/tests/auto/network/selftest/selftest.pro
new file mode 100644
index 0000000000..e8312032c3
--- /dev/null
+++ b/tests/auto/network/selftest/selftest.pro
@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_networkselftest
+SOURCES  += tst_networkselftest.cpp
+
+requires(qtConfig(private_tests))
+QT = core network network-private testlib
diff --git a/tests/auto/network/selftest/tst_networkselftest.cpp b/tests/auto/network/selftest/tst_networkselftest.cpp
new file mode 100644
index 0000000000..a540e18f48
--- /dev/null
+++ b/tests/auto/network/selftest/tst_networkselftest.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include "../../network-settings.h"
+
+class tst_NetworkSelftest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testServerIsAvailableInCI();
+};
+
+void tst_NetworkSelftest::testServerIsAvailableInCI()
+{
+    if (!qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci"))
+        QSKIP("Not running in the CI");
+
+#if !defined(QT_TEST_SERVER)
+    QVERIFY2(QtNetworkSettings::verifyTestNetworkSettings(),
+        "Test server must be available when running in the CI");
+#endif
+}
+
+QTEST_MAIN(tst_NetworkSelftest)
+
+#include "tst_networkselftest.moc"