diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-15 11:12:09 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-30 19:33:08 +0200 |
| commit | 82188607e3aaaffd7687766fef6686c399e4c046 (patch) | |
| tree | c4694d73d9dc71983110a5b03748f58cd0705a87 /tests/auto/other/qnetworkaccessmanager_and_qprogressdialog | |
| parent | c8ca0e70709c1a631607d45c555df1035e2a542e (diff) | |
CI: Add docker support for qnetworkaccessmanager_and_qprogressdialog test
Currently test relies solely for external test server. This makes it
not possible to run test successfully with environment where docker is
used.
Pick-to: 6.2 6.3
Change-Id: I51f4f48a80c1be8dd24359fe24d9cbfd471d2195
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/other/qnetworkaccessmanager_and_qprogressdialog')
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt index e4041de233..bf6fabe17a 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt @@ -11,4 +11,5 @@ qt_internal_add_test(tst_qnetworkaccessmanager_and_qprogressdialog Qt::Gui Qt::Network Qt::Widgets + QT_TEST_SERVER_LIST "apache2" ) diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index a321900df2..752e92b2e3 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -68,13 +68,13 @@ public: public slots: void go() { - QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile")); + QNetworkRequest request(QUrl("http://" + QtNetworkSettings::httpServerName() + "/qtest/bigfile")); if (zeroCopy) request.setAttribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute, 10*1024*1024); QNetworkReply *reply = netmanager.get( QNetworkRequest( - QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile") + QUrl("http://" + QtNetworkSettings::httpServerName() + "/qtest/bigfile") )); connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(dataReadProgress(qint64,qint64))); @@ -117,8 +117,13 @@ tst_QNetworkAccessManager_And_QProgressDialog::tst_QNetworkAccessManager_And_QPr void tst_QNetworkAccessManager_And_QProgressDialog::initTestCase() { +#ifdef QT_TEST_SERVER + if (!QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80)) + QSKIP("No network test server available"); +#else if (!QtNetworkSettings::verifyTestNetworkSettings()) QSKIP("No network test server available"); +#endif } void tst_QNetworkAccessManager_And_QProgressDialog::downloadCheck_data() |