diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-04-08 13:37:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 17:38:39 +0200 |
| commit | 4e1cdab23c42d40fef474fca43fc431907cd18c1 (patch) | |
| tree | ff1228cc92fa4740c946c0330981ab13018b7438 /tests/auto/qml/qqmlxmlhttprequest | |
| parent | 2ab6a34a7e9c307a43c23262aeee398dc5fb91bc (diff) | |
Fix XHR auto tests always failing
The test (rightly so) expects that even for a 400 response, the responseBody
must be preserved - as per commit 0949071f13e7bcbc16a0f07f496e0b6a23b04edd.
However before commit fd5dd2712656cbc674c8360754394e41dd82e40c in qtbase, 400
was mapped to QNetworkReply::UnknownContentError, which is "handled" by
QQmlXMLHttpRequest::error in the sense that the body is preserved. After the
qtbase behavioral change, 400 now maps to
QNetworkReply::ProtocolInvalidOperationError, which was _not_ handled, the body
was cleared and the test failed.
The revdep of qtdeclarative for qtbase should've caught the behavioral change
in qtbase, but unfortunately the auto-test was disabled (marked insignificant).
This patch adjusts the xhr implementation to the behavioral change in qtbase
and also re-activates the xhr auto-test (we really should be testing our xhr
implementation in the CI system...).
Task-number: QTBUG-38180
Change-Id: I7655fd9037752ad644a98d01257bf5f81e7daa15
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'tests/auto/qml/qqmlxmlhttprequest')
| -rw-r--r-- | tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro index f1fbfde0ec..fcfdf23d33 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro +++ b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro @@ -2,8 +2,6 @@ CONFIG += testcase TARGET = tst_qqmlxmlhttprequest macx:CONFIG -= app_bundle -CONFIG+=insignificant_test # QTQAINFRA-573 - INCLUDEPATH += ../../shared/ HEADERS += ../../shared/testhttpserver.h |