diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 01:00:38 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 01:00:39 +0100 |
commit | c3123c757a2301445ac286ce2c8af20959151e21 (patch) | |
tree | c8f5421725d0fe0cfe8a29136937e54d6f3f95c2 /tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | |
parent | 2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff) | |
parent | 7a59d6f138ff8799170cc03d709525ab965d703a (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I8dbcf23835d52d3aa7d018ed250814d60c68aa83
Diffstat (limited to 'tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp')
-rw-r--r-- | tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 0a9320118d..57fa5a613c 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -105,7 +105,8 @@ void tst_QHttpNetworkConnection::initTestCase() #if defined(QT_TEST_SERVER) QVERIFY(QtNetworkSettings::verifyConnection(httpServerName(), 80)); #else - QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); + if (!QtNetworkSettings::verifyTestNetworkSettings()) + QSKIP("No network test server available"); #endif } |