diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-06-08 16:19:04 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-06-30 07:07:11 +0000 |
| commit | 2714d94ff4652e863f2e6005a138a2563d836f07 (patch) | |
| tree | e60c2afa42ca90e5d3980e6516f0149213a24db6 /tests/auto | |
| parent | df9aee21504b18decbd5637ca4ce86c559fa3cc3 (diff) | |
Fix tst_QNetworkReply::qtbug45581WrongReplyStatusCode() on Windows
The file is read using CRLF line convention on Windows.
Task-number: QTBUG-24226
Change-Id: Ie08fa603e29c80a42de4bfbfd1f4237f53c22b98
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 02aca3d6c1..0f2d0873a7 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -7295,7 +7295,11 @@ void tst_QNetworkReply::qtbug45581WrongReplyStatusCode() const QByteArray expectedContent = "<root attr=\"value\" attr2=\"value2\">" - "<person /><fruit /></root>\n"; + "<person /><fruit /></root>" +#ifdef Q_OS_WIN + "\r" +#endif + "\n"; QCOMPARE(reply->readAll(), expectedContent); |