summaryrefslogtreecommitdiff
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-34/+24
|\ | | | | | | Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
| * Fix empty sslConfiguration in sslErrors slotAndré Klitzing2017-10-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWebSocket fires signal sslErrors the QSslConfiguration of QWebSocket is not updated. So client application cannot check it in implemented slot. Fix this by calling the update method like for encrypted signal. Sibling of QTBUG-40401. Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Check count of spy to verify signalAndré Klitzing2017-10-271-31/+17
| | | | | | | | | | | | | | | | | | | | | | | | Looks like QVERIFY(spy.wait()) is a little bit flaky. We should check the count of the spy if it was successful instead of the return value of wait since wait will return false even if the signal was delivered before the call to wait(). Change-Id: I5f9031685dfa69b00155fa22602bab998843cb68 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>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-151-0/+5151
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3dd9c568ed9160510bff527355ecfbed5d4690a9
| * Update binary compatibility file for Qt 5.9.0 for QtWebSocketsMilla Pohjanheimo2017-06-301-0/+5151
| | | | | | | | | | | | | | Binary compatibility file updated for Qt 5.9.0. Change-Id: I58561a76c8f9d3353d9cf352dd39734044c3e8e2 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Enable tests for boot2qtSami Nurmenniemi2017-07-194-7/+57
|/ | | | | | | | | | | | | Websocket tests for boot2qt were disabled with commit 1a75da8d514c90cf1af250ba3eaa764df4838775. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Qemu still has missing syscall support so some tests need to be skipped if that condition is detected. Change-Id: I39dba91cb35cc17a9a9263c90a739cbf95efa582 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-092-0/+6
| | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ib93153c857c1645c189db1bd69951cc29acfdccf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-102-1/+5132
|\ | | | | | | Change-Id: Idcd43fba828b00cef553c3142462a4776aeeda8d
| * Exclude console application tests on UIKit platforms5.8Jake Petroules2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | Those platforms do not support console applications with the public SDK. Change-Id: I8993882c04c5a4b539f297d13ae09ce9ae8e9463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Aleksey Lysenko <lysenkoalexmail@gmail.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Binary compatibility file for qtwebsockets (5.8.0)Milla Pohjanheimo2017-02-031-0/+5131
| | | | | | | | | | | | | | Added binary compatibility file for qtwebsockets Change-Id: Ia5c70c8f15fba7bd09c40d2bafe95802cb52a6c7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Add a function to hand off a tcp socket to the websocket serverAleksey Lysenko2017-01-271-0/+34
|/ | | | | | | | | | | | | This method allows a listening port to process connections with different protocols. It lets the websocket server handle a TCP socket, upgrading it to a websocket [ChangeLog][QWebSocketServer] Add support to handle external QTcpSocket Done-with: André Klitzing <aklitzing@gmail.com> Task-number: QTBUG-54276 Change-Id: Ia36b481dc87d6f3806e9f1e61e75e528640f1937 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix the parser of port in hand shake requestLiang Qi2017-01-061-0/+103
| | | | | | | | | | Use QUrl::setAuthority() to parse host and port. The request is invalid when having username or password in Host. Task-number: QTBUG-57357 Change-Id: I4e7c0370794dce15359d372a1e36dc0383083204 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed possible block clearing in QWebSocketDataProcessor::process methodAleksey Lysenko2017-01-041-8/+46
| | | | | | | | | | | | | In QWebSocketDataProcessor::process() the signals text(binary)MessageReceived are emitted before clear() method. If signal handler blocks loop (for example, using QDialog::exec()), clear() will be called only after resuming loop. It may lead to the data corruption due to the fact that QWebSocketDataProcessor clearing won't be performed before the new data arrived. Task-number: QTBUG-55506 Change-Id: Ib7016a91d3987dec7c1af977b17f86a53568c413 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fixed wrong scheme for secure websocketAleksey Lysenko2016-12-165-0/+109
| | | | | | | | | | Websocket server always constructed QWebSocketHandshakeRequest like for non-secure socket without checking SecureMode. This led to the fact that secure socket had "ws" scheme. Task-number: QTBUG-55927 Change-Id: I881766f55182136072fd23f3fefe93ea60f3d27d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-0/+10112
|\ | | | | | | Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f
| * Binary compatibility file for QtWebSockets (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+5096
| | | | | | | | | | | | | | BC file added for QtWebSockets module Change-Id: I94fdae9d83003ebe17a2799794047ee095880205 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-011-0/+5016
| |\ | | | | | | | | | Change-Id: I95f1e6fd6e9033e27bcf618e1eb50cd011ac5c4b
| | * Added binary compatibility data files to QtWebSockets for Qt 5.6Milla Pohjanheimo2016-09-301-0/+5016
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtWebSockets for Qt 5.6 Change-Id: I2fce98cac5eec3dbf6192782ea419653ea5f3db2 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Clean up QT_CONFIG usageLars Knoll2016-08-197-7/+7
| | | | | | | | | | | | | | | | | | | | | Use the newer qtConfig() method instead. Change-Id: I197dbe01edaf8696ee06d30400bd18e53cf69c94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Add support for TLS PSK (client and server)André Klitzing2016-06-121-0/+127
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][QWebSocket] It is now possible to use TLS PSK ciphersuites. Change-Id: I9e96669494cec5e6a4e076fe9f10fcd4ef6358a4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Add binary message support to QML WebSocket typeNobuaki Sukegawa2016-03-051-1/+24
|/ / | | | | | | | | Change-Id: I4472e899606d261420141e7b382717cbe12943c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2013-221/+156
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I191cd4111d18052fbe80bbe21bf851bf4795a1a6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Add QML test casesNobuaki Sukegawa2015-12-281-4/+44
| | | | | | | | | | Change-Id: Ie652bddf7f98271d01ebe6818817ea28d9c83fae Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Test: replace obsolete QUrl::addQueryItem()Liang Qi2015-10-211-1/+3
| | | | | | | | | | Change-Id: I266b98d309a8912efb988a4c7a006d6fefb48531 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-204-21/+192
|\ \ | |/ | | | | Change-Id: I8d2c4b0982623839b880a9d8fbe7f5ee69d33ad3
| * Test: replace obsolete QChar::fromAscii()Liang Qi2015-10-201-2/+2
| | | | | | | | | | | | Change-Id: Ib41421e87af66d6ba9248b66e713e452d226143d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-201-1/+1
| |\ | | | | | | | | | Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
| | * Test: stablize tst_QWebSocket::tst_moveToThread()5.5Liang Qi2015-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For e8335d48, the test is flaky, but old CI treated it as a PASS. Task-number: QTBUG-48843 Change-Id: I4d2c0d270824d7b1e954e9174493fba2c1c5433f Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-023-5/+176
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
| | * Fix DoS vulnerabilityv5.5.15.5.1Kurt Pattyn2015-09-062-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add checks on maximum header line length and on the maximum number of header lines. Task-number: QTBUG-48123 Change-Id: I65dbeb53af7aa0dfa137ce31fc2549940559314e Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Set parent of internal socket objectsPeter Kümmel2015-09-041-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After moving the websocket into another thread current code doesn't work because then the QTcpSocket/QSslSocket objects reside in a different thread, for instance: "QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread" QObject::moveToThread(QThread*) also moves QObjects's children, therefore their internal socket objects need to be children of QWebSocket. QWebSocket has ownership of the internal socket, and the smart pointer is not needed any more. Change of cleanup code to prevent crashes with clang/msvc builds: QWebSocketPrivate is a scoped member of QObject (not QWebSocket) and is destroyed after QObject destructor body was executed, and so m_pSocket&co had already been destroyed (being children) when the destructor of QWebSocketPrivate is called via the scoped pointer. Analogous to 64927e04f202d33b9a9a1f94141ef692c0b513ac Change-Id: I1ade6cda3fa793c30332cc5e103025e2dda3c78c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | rsv1-3 should be bool instead of intLiang Qi2015-09-141-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | And reorded the data members of QWebSocketFrame to save some space. Change-Id: I6fdaf74f344ac84e5a3f19883309455503a7ec4c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Maks Naumov <maksqwe1@ukr.net> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-312-4/+6
| | | | | | | | | | | | | | | | | | | | | Fix usage of API that is marked deprecated. Change-Id: Ie1bd25b22a8bd4faa6885ac3670dcc3c25c17ab2 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-318-8/+0
|/ / | | | | | | | | Change-Id: I0315e4692f680dec121f8e8fa5d90dd2826f4900 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-0/+1
|\ \ | |/ | | | | Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
| * WebSocketServer: use int type for portLiang Qi2015-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | QML engine doesn't support quint16 as a QML type. Task-number: QTBUG-46790 Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-3027-13/+215
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/websockets/qwebsocket_p.cpp Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
| * tests: enable cmake in auto testsLiang Qi2015-05-221-1/+1
| | | | | | | | | | Change-Id: Idbfbaa86675381110f35118baf16cac891976707 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-228-0/+199
| | | | | | | | | | | | | | | | | | It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * tests: move all auto tests to websockets sub directoryLiang Qi2015-05-2220-14/+17
| | | | | | | | | | | | | | cmake is not included. Change-Id: I9ab6244d8b6b3752f26070b0b15ae70c0cab6d82 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix incorrectly encoded data tagSimon Hausmann2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | Properly encode the provided sequence in UTF-8, so that the XML output of testlib is correctly encoded. Otherwise parsing the XML output in an automated manner breaks. Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Add missing check for socket connection in testFrederik Gladhorn2015-06-111-0/+1
| | | | | | | | | | | | | | | | | | In a5cb3b8ff10fcf1def8bde6f814582be1c19b83b I made the tst_openRequest less reliable because the socketConnectedSpy is no longer checked. Change-Id: Id721fa4aa203eeb85a5fce85a5270bc14cc37ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Fix flaky test: QTRY_COMPARE instead of qWaitFrederik Gladhorn2015-06-101-15/+6
| | | | | | | | | | Change-Id: Iad643950d669addf90f68b2bf9be29c755f9c1d9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-261-1/+9
| | | | | | | | | | | | Task-number: QTBUG-40842 Change-Id: I02787a0e55701966e564a312d51297f4160bd89a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-112-1/+48
|\ \ | |/ | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-151-0/+34
| |\ | | | | | | | | | Change-Id: I29f5a2acb7ba0313d9e2ac2c005a988d208b617e
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-081-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lifetime of incoming QTcpSocket/QSslSocket are managed by the QTcpServer/QSslServer and thus the QWebSocketPrivate should clear the pointer to the socket when the socket is destroyed. Added auto test for the crash. Task-number: QTBUG-45331 Change-Id: I6e30e7cdcca22aa810ccc1a1d4d7d77c7cb2c349 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | The resource needs to be sent encoded in the HTTP request. Task-number: QTBUG-44889 Change-Id: I3c6c56f5fea1553f3b5751de7da0cfc76150f4b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client-side constructor was leaving it uninitialized, which would sometimes lead to spurious error signals being emitted. Task-number: QTBUG-44893 Change-Id: I7a17f1a16d9a5fe4218beb6d92993c1889ad836b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-081-0/+22
|/ / | | | | | | | | | | | | | | | | | | | | Request headers are not yet handled, only the QNetworkRequest::url() is taken into consideration. [ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request() Task-number: QTBUG-40842 Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
View Lorry Controller Status