aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Blacklist two tests in handshakerequest"Edward Welbourne2023-01-311-5/+0
| | | | | | | | | | | | | This reverts commit 9486a8053edd0eab68a03178effebda0d5194607. The bug that caused this has now been fixed, so presumably these tests should now be OK again. Change-Id: Ifed83aedccc32cdd68600f94c1b3c5b8d5c7c8b9 Task-number: QTBUG-84315 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 92fa05e8721dc29984a544686c646a77b9531c95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: ignore some tst_qwebsockerserver unit testsAssam Boudjelthia2022-05-301-0/+5
| | | | | | | | | | | | | | | Ignore those tests to allow enalbing CI tests and fix them one by one after that. These couple cases fail mainly because they don't have the openssl libs bundled with the apk, that is expected to be handled under QTBUG-89053. Task-number: QTBUG-102713 Change-Id: I5cb3d9f62f6943d1477c99456cd650b69ab8c86d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit ab7dd2ac029da966bcd0095b97168fb364d73006) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: package qml test dataAssam Boudjelthia2022-05-301-0/+5
| | | | | | | | | Task-number: QTBUG-88846 Change-Id: I7505f68e99d173edd93770b2b37c77ecc2b128e7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit a398b65eda5c6da263c440a460220ad47aec1a82) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Blacklist: test cases blacklisted in tst_QWebSocketServer:"Pasi Petäjäjärvi2022-04-011-4/+0
| | | | | | | | | | This reverts commit 2b379a41a55a89673643b0a39c6e2f93db7fc632. Reason for revert: Should not have been merged Task-number: QTBUG-101333 Change-Id: I3ce0bfe544002363400f32f5a2304c310978dc49 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* tst_QWebSocket: fix scope of ifdef proxy-checkMårten Nordheim2022-03-311-2/+1
| | | | | | | | | | Because other tests had made their way inside Change-Id: Ie6fa545a84c2f66e0c2617f498118a3e04eedd0c Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit ebf82dc805354e8d9b1c2f0a45bad6594dbbbd22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist: test cases blacklisted in tst_QWebSocketServer:CI Insignificant Platforms Monitor Bot2022-03-011-0/+4
| | | | | | | | | | - tst_handleConnection on qnx Task-number: QTBUG-101333 Change-Id: If81ec4cb7099063d9b000221aca521579979653c Reviewed-by: CI Insignificant Platforms Monitor Bot <ci_insignificant_platforms_monitor_bot@qt.io> (cherry picked from commit 1d0767f546db7db839029d1f51196dc0f60390ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-enable cmake build test for qtwebsocketsJuha Vuolle2022-01-122-8/+36
| | | | | | | | Task-number: QTBUG-92967 Change-Id: I2c138fd2614c08936e4253ec58c82d282cd726f3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 8d7d0c16302597f36a45da83f92ff7e003cbfd1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-221-1/+1
| | | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Task-number: QTBUG-95018 Change-Id: I06f634b2196b5207a4cf8f926e0886cc999fa5ac Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 2d30f37ebdea5914d45f00f1a8e08d2a1ed35df5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation warningsTopi Reinio2021-09-081-0/+0
| | | | | | | | | | | * Rename a file included by QDoc to have the correct extension * Add missing \a command to mark a function argument Fixes: QTBUG-96287 Change-Id: I9724b67f641ba634c91a74e3e05821f1edfeb4ad Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 742ba2c5172a306a2c584da90ba7f7aa9c0c1317) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-221-8/+2
| | | | | | | Task-number: QTBUG-86726 Change-Id: Ib270d786ded8cc64c2cc596b92bb4e30051de311 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate projects to use new CMake APIAlexandru Croitor2020-12-1010-12/+12
| | | | | Change-Id: Iaaa4a44c8cf8735aa17293540e701ababace8155 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Remove Qt5 leftoversPeter Varga2020-12-017-107/+1
| | | | | Change-Id: Ifecb6f90687601a20e719db3ba194e33f3303f24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix the buildSona Kurazyan2020-06-291-4/+4
| | | | | | | Fix the build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9. Change-Id: Ib84138cc94a0ce04f83a20a91be48e11abb6f569 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-231-2/+2
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I36460d504aaac08bdbb64b6c71b5ab10e062e00d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Qt6: Remove single usage of soon to be deprecated QStringRefKarsten Heimrich2020-06-101-1/+1
| | | | | | Task-number: QTBUG-84319 Change-Id: I03279783140af155b5db55f5c0584832af009f8a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-081-4/+4
| | | | | | Task-number: QTBUG-84469 Change-Id: I88d02a42879cefaefbbbcf9faa6b5c3a84ec4f1a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Blacklist two tests in handshakerequestLiang Qi2020-05-191-0/+5
| | | | | | Task-number: QTBUG-84315 Change-Id: I0bbe1e22adcf7e653d44921d8fc9ec603dc36283 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Stabilize testAllan Sandfeld Jensen2020-05-081-1/+1
| | | | | | | It times out on my machine. Change-Id: I6c57167c76eca434b2c64d4938e034452e4d7e02 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-312-3/+89
|\ | | | | | | Change-Id: I7b3d96575073eb6537b40286c027074969bf8076
| * Add a public api to set max frame and message size (CVE-2018-21035)Franck Dude2020-03-192-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the user to set a lower allowed frame/message size for reception. The purpose is to avoid an attacker to exhaust the virtual memory of the peer. Fixes CVE-2018-21035 [ChangeLog] Added public API to set the maximum frame size and message size Task-number: QTBUG-70693 Change-Id: I5dc5918badc99166afdcc8d9c6106247a9f8666f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Revert "Speculatively increase timeouts in tst_qwebsocket"Timur Pocheptsov2020-03-191-5/+5
| | | | | | | | | | | | | | | | | | This reverts commit 8c4b6d212c72b8bb59bc687cbc35bbdebe112434. Reason for revert: It didn't fix the issue Change-Id: I11490a968746255e6f7fd906cddcc3ee36ca6201 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Speculatively increase timeouts in tst_qwebsocketMårten Nordheim2020-03-181-5/+5
| | | | | | | | | | | | | | In case it's causing these recent failures. Change-Id: Icdedab57e2e46d332bf1ae9c1d4869a2ed480d94 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-2310-31/+14
| | | | | | | | | | | | Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-233-17/+6038
|\| | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189
| * Stabilize tst_QWebSocketServer::tst_handshakeTimeoutv5.15.0-beta2Mårten Nordheim2020-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | The test was a bit flaky which seems to have been due to the short timeout. Increase the timeout a considerable amount, it doesn't matter much to the runtime anyway: the test still takes around 5 seconds to finish. Fixes: QTBUG-82559 Change-Id: Ie14ea204de1cc7ac2951144099d5be88adebef04 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-171-1/+0
| | | | | | | | | | Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+6021
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
| | * Add binary compatibility file for qtwebsockets 5.14 branchMilla Pohjanheimo2019-12-161-0/+6021
| | | | | | | | | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: Ib72e1fd443bf88cec944ab451edcc43ca070a135 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Cleanup QWebSocketFrameChristian Ehrlicher2019-11-261-15/+11
| |/ | | | | | | | | | | | | | | | | | | | | Remove QWebSocketFrame assignment and move stuff by our own - the default ones are good. Also reorder the members to reduce the padding (56 to 48 bytes on 64bits). Change-Id: Ib4628628af924c36ad3cd9bf67ce72752ef97ff5 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Regenerate projectsAlexandru Croitor2019-11-1510-12/+12
| | | | | | | | | | | | Change-Id: Ie454c70664c94743c0323d3d5fb8d4d7f224f3f1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-155-12/+6089
|\| | | | | | | | | | | Removed dependencies.yaml. Change-Id: Ie799709d6a94054ca937c70a73fd979efb9619f7
| * Add support for chrono versions of handshakeTimeout functionsv5.14.0-beta2Mårten Nordheim2019-10-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | And rename the int-version of the getter to enable the scenario where someone does not have chrono. From the 5.14 API change review. Amends 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 Change-Id: Icf2f2a3aebc2216defd0a3a569544c4270ddf05a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-031-0/+5977
| |\ | | | | | | | | | Change-Id: I9c23395dfda8bfaf308dacbf17c471b62803371c
| | * Binary compatibility file against Qt5.13.0 for QtWebSocketsMilla Pohjanheimo2019-08-261-0/+5977
| | | | | | | | | | | | | | | | | | | | | BC file added. Change-Id: Ibc33a9a55c8dc378938046cb3c45c1464864e348 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | QWebsocket doesn't receive message with size larger than 1MRyan Chu2019-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the processing of QWebSocketFrame is not done and waiting for more data, QWebSocketPrivate::processData should return the control and wait for next readyRead signal. Continue the change of b2fc794ffaf48c9d9c401b54cf39ea0220617a27 Change-Id: Idf5af0710267e59e63b8e234d6dab5843d821696 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Merge dev into 5.14Kari Oikarinen2019-08-273-12/+72
| |\ \ | | | | | | | | | | | | Change-Id: I2eaffbe6e9519a78d0f8663c0870f24cb006d222
| | * | Add the missing tests in tst_DataProcessor::frameTooSmallRyan Chu2019-08-231-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are missing tests of 'text frame with final bit not set'. After dataProcessor.process, the spied signals should be compared and cleared before processing next frame. Change-Id: I5737da9d57e0043cfedb400f4e0934c5ce7c4250 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | Remove waitForReadyRead from QWebSocketFrame::readFrameRyan Chu2019-08-232-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asynchronously process socket frame in QWebSocketDataProcessor::process. If the processing of QWebSocketFrame is not done and waiting for more data, QWebSocketDataProcessor::process will return the control and wait for next readyRead signal to continue processing the unfinished socket frame. QWebSocketDataProcessor::process gets timeout after 5 seconds, and then an errorEncountered signal will be emitted. Fixes: QTBUG-74464 Change-Id: I03b7f874c1c266617e7eadf59c59ae43fa8540ce Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | Make QWebSocketFrame::readFrame as a non-static public functionRyan Chu2019-08-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static function QWebSocketFrame::readFrame used to return a parsed QWebSocketFrame read from QIODevice. This change make QWebSocketFrame reusable. It will base on its internal state and keep processing the incoming data from QIODevice. Change-Id: Ic6dea59529fa935cdb8034519e633ea67e869674 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Properly handle multiple websocket frames in one TCP frameMårten Nordheim2019-08-261-0/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can have multiple websocket frames in one TCP frame we need to handle them all. Partial revert of b14f5f59a3ae96949e6a33302385a751d6448182 Fixes: QTBUG-77830 Change-Id: If435f6e67f04e4817a3202eb8fe779243591bff3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Regenerate before mergeAlexandru Croitor2019-10-1512-3/+61
| | | | | | | | | | | | | | | Change-Id: I9f22f5d050aeec3e8c308e286a897f0f524ed8e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add initial-support for cmakeMaurice Kalinowski2019-09-1614-0/+227
|/ / | | | | | | | | | | | | Task-number: QTBUG-78180 Change-Id: If6cf82c61d605332402feffca9bde2ea0dd6e313 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Investigate tst_handshakeTimeout test flakinessMårten Nordheim2019-06-271-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "localhost" in favor of "127.0.0.1" to avoid any name resolution. And wait 5 seconds for all websockets to timeout together, while printing how many have not timed-out in case of failure. Credits to Mårten Nordheim for coding this. With this patch, I can not reproduce the flakiness any longer. Lets see if this is also the case in our CI. Fixes: QTBUG-76572 Change-Id: Ibdbafbd7786c87138bdc84ebc690177211f23f5b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Fix compilation error when configured without SSLDimitrios Apostolou2019-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | QTcpSocket definition is apparently indirectly included when compiling with SSL support enabled, but without it the compiler outputs error. Change-Id: I5f4d8978ef04442443e934ee28e949a49a9f5b18 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | tst_QWebSocketServer: Fix deprecation warnings about ↵Friedemann Kleint2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | QSslSocket::supportedCiphers() Replace by QSslConfiguration::supportedCiphers(). Change-Id: Ia5ce3e399272127304ea7e93ba32627df5864381 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | websocket server: add timeout to abort incomplete handshakesHeiko Voigt2019-04-291-14/+154
|/ | | | | | | | | | | | | | | | | | | | | | | | A websocket connection can involve two types of handshakes. First an optional SSL handshake and second the websocket handshake itself. Either one can get stalled/stuck if the other side does not answer. To be robust by default and for easy mitigation by users of websockets let's introduce a handshake timeout. We introduce a default timeout of 10 seconds which can be customized by the newly introduced setHandshakeTimeout() method. One major location where connections got stuck was when the connection queue was filled with connections waiting for the SSL handshake. Only connections that have finished this handshake can be processed anyway so we now add them to the queue once they are fully ready to start the websocket handshake. Task-number: QTBUG-63312 Task-number: QTBUG-57026 Change-Id: Ia286221f1d8da1000e98973496280fde16ed811d Reviewed-by: Alf Crüger <a.crueger@baxi-innotech.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add binary comaptibility file for QtWebSockets for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5602
| | | | | | | Binary compatibility file added. Change-Id: I3a7c598cc47fb243325881c089857ec8955dd67c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-241-0/+5
|\ | | | | | | Change-Id: I8cd45ab778b95b7d444b06940fd7b4ddc83a599b
| * tst_qwebsocketserver: force TLS 1.2 for the PSK testMårten Nordheim2018-11-231-0/+5
| | | | | | | | | | | | | | | | | | | | When using TLS 1.3 the psk callback is called on the start of a connection. Force TLS 1.2 to avoid this. Task-number: QTBUG-71560 Change-Id: I97df3a9d2f100d10b4a1d2e8d0e4696688ec66ac Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 7022a1f7e8f703815022bc7d0956da54f9f7a3c1)
* | Fix implicit conversion warningJesus Fernandez2018-08-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Marks the old functions as deprecated and adds new safe versions.The new functions give access to the native descriptor safely. It also fixes the original functions in Qt 6. warning: implicit conversion loses integer precision: 'qintptr' (aka 'long long') to 'int' Change-Id: I59177905af0181912d2e7824ce68265cb8ee03d9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 22:08:54 +0000