From f00e332d3947e71f8d140bceb994cef627fa5a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 24 Feb 2022 22:43:11 +0200 Subject: CI: Add docker support for tst_qtextstream test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: If716921ce6ceea1ced2d0d7025c6e9768b4ed7a7 Reviewed-by: Volker Hilsheimer Reviewed-by: Mårten Nordheim --- tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt | 1 + tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index c0b9752fc5..1db76f274f 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -19,6 +19,7 @@ qt_internal_add_test(tst_qtextstream Qt::Network Qt::TestPrivate TESTDATA ${test_data} + QT_TEST_SERVER_LIST "cyrus" ) # Resources: diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp index c02da8efe1..9e8bcfaea2 100644 --- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp @@ -1211,11 +1211,16 @@ void tst_QTextStream::stillOpenWhenAtEnd() while (!stream.readLine().isNull()) {} QVERIFY(file.isOpen()); +#ifdef QT_TEST_SERVER + if (!QtNetworkSettings::verifyConnection(QtNetworkSettings::imapServerName(), 143)) + QSKIP("No network test server available"); +#else if (!QtNetworkSettings::verifyTestNetworkSettings()) QSKIP("No network test server available"); +#endif QTcpSocket socket; - socket.connectToHost(QtNetworkSettings::serverName(), 143); + socket.connectToHost(QtNetworkSettings::imapServerName(), 143); QVERIFY(socket.waitForReadyRead(5000)); QTextStream stream2(&socket); -- cgit v1.2.3