summaryrefslogtreecommitdiffstats
path: root/tests/manual/network_stresstest/tst_network_stresstest.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-16 01:00:11 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-01-17 08:52:14 +0100
commitc70208c2d0fa9ef40795190ce7b9fc8e928df961 (patch)
treea17f2900cacf4c3aab2e99fa108b142fdf5e2a00 /tests/manual/network_stresstest/tst_network_stresstest.cpp
parent63b0b857f3cc84315a10c9b6d988bd657e7ce998 (diff)
parent0a4e5bb265c4a2345a9cbffab1b5150124b8d31e (diff)
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'tests/manual/network_stresstest/tst_network_stresstest.cpp')
-rw-r--r--tests/manual/network_stresstest/tst_network_stresstest.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp
index 03df1633d5..5f2fd2b24e 100644
--- a/tests/manual/network_stresstest/tst_network_stresstest.cpp
+++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp
@@ -123,7 +123,8 @@ void tst_NetworkStressTest::initTestCase_data()
void tst_NetworkStressTest::initTestCase()
{
- QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+ if (!QtNetworkSettings::verifyTestNetworkSettings())
+ QSKIP("No network test server available");
}
void tst_NetworkStressTest::init()