qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tst_qqmlxmlhttprequest: Skip locale dependent tests 

...in case the locales is not en-us. Ideally we would make the test not
dependent on the system locale, but the best way to achieve is not
clear, and skipping tests that have no chance of succeeding is the next
best thing we can do.

Pick-to: 6.2
Fixes: QTBUG-59223
Change-Id: I1d7dfca267b01b701e369043d028d61f2f687fcd
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2021-11-17 15:19:06 +01:00
parent 6b946bb68b
commit 04f635b808
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
View File

@ -662,6 +662,8 @@ void tst_qqmlxmlhttprequest::send_options()
void tst_qqmlxmlhttprequest::send_options_data() void tst_qqmlxmlhttprequest::send_options_data()
{ {
if (QLocale::system() != QLocale(QLocale::English, QLocale::UnitedStates))
QSKIP("Test is locale dependent");
QTest::addColumn<QString>("url_suffix"); QTest::addColumn<QString>("url_suffix");
QTest::addColumn<QString>("file_expected"); QTest::addColumn<QString>("file_expected");
QTest::addColumn<QString>("file_qml"); QTest::addColumn<QString>("file_qml");
@ -886,6 +888,8 @@ void tst_qqmlxmlhttprequest::getAllResponseHeaders_args()
void tst_qqmlxmlhttprequest::getBinaryData() void tst_qqmlxmlhttprequest::getBinaryData()
{ {
if (QLocale::system() != QLocale(QLocale::English, QLocale::UnitedStates))
QSKIP("Test is locale dependent");
TestHTTPServer server; TestHTTPServer server;
QVERIFY2(server.listen(), qPrintable(server.errorString())); QVERIFY2(server.listen(), qPrintable(server.errorString()));
QVERIFY(server.wait(testFileUrl("receive_binary_data.expect"), QVERIFY(server.wait(testFileUrl("receive_binary_data.expect"),
@ -905,6 +909,8 @@ void tst_qqmlxmlhttprequest::getBinaryData()
void tst_qqmlxmlhttprequest::getJsonData() void tst_qqmlxmlhttprequest::getJsonData()
{ {
if (QLocale::system() != QLocale(QLocale::English, QLocale::UnitedStates))
QSKIP("Test is locale dependent");
TestHTTPServer server; TestHTTPServer server;
QVERIFY2(server.listen(), qPrintable(server.errorString())); QVERIFY2(server.listen(), qPrintable(server.errorString()));
QVERIFY(server.wait(testFileUrl("receive_json_data.expect"), QVERIFY(server.wait(testFileUrl("receive_json_data.expect"),
@ -1246,6 +1252,8 @@ void tst_qqmlxmlhttprequest::sendFileRequestNoRead() {
void tst_qqmlxmlhttprequest::sendPropfind() void tst_qqmlxmlhttprequest::sendPropfind()
{ {
if (QLocale::system() != QLocale(QLocale::English, QLocale::UnitedStates))
QSKIP("Test is locale dependent");
const QString prefix = "WebDAV//"; const QString prefix = "WebDAV//";
QFETCH(QString, qml); QFETCH(QString, qml);