aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-08-12 09:40:00 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-08-12 12:42:01 +0200
commitab7e52377e0470b369f0456b15ae926bd7862ea6 (patch)
tree386b54711db04d0fbc5434b8dd84bcb5c202fc1f
parent0d70ea37f83cb5a8caf63cbcebb30ddc48803190 (diff)
tst_qqmlxmlhttprequest: Ignore HTTP encoding headers
Apparently QtNetwork changed the default order of encodings. We don't really care about this anyway, though. Change-Id: I72e5f0783e5e88ddb9fe031f72ff5f6c760256fa Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/abort.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expectbin223 -> 220 bytes
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/status.expect2
20 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect
index f0dc8ed3fd..420ba41d9a 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect
@@ -2,7 +2,7 @@ PROPFIND /container/ HTTP/1.1
Depth: 1
Content-Length: 95
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
Accept-Language: en-US,*
Content-type:i application/xml; charset="utf-8"
User-Agent: Mozilla/5.0
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect
index 2d14de634d..f7dcb2b0c6 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect
@@ -1,7 +1,7 @@
PROPFIND /file HTTP/1.1
Content-Length: 192
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
Accept-Language: en-US,*
Content-type: text/xml; charset="utf-8"
User-Agent: Mozilla/5.0
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect
index 7e1edeb2a3..44e4c77a8e 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US
Content-Type: text/plain;charset=UTF-8
Content-Length: 9
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect
index bc40e5ea0f..312421ba79 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect
@@ -1,7 +1,7 @@
GET /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect
index bc40e5ea0f..312421ba79 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect
@@ -1,7 +1,7 @@
GET /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect
index 112ac4e207..1eebf23868 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect
@@ -2,6 +2,6 @@ GET /gml_logo.png HTTP/1.1
Accept-Language: en-US,*
Content-Type: image/png
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect
index 97b016f50a..6d80181053 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect
@@ -2,6 +2,6 @@ GET /json.data HTTP/1.1
Accept-Language: en-US,*
Content-Type: application/jsonrequest
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect
index 144f0f6e98..786c73d32e 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US
Content-Type: text/plain;charset=UTF-8
Content-Length: 12
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect
index 8d83a00549..6e3bea4d52 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US,*
Content-Type: text/plain;charset=UTF-8
Content-Length: 12
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect
index 6d34e1d2bb..0ed73db70e 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect
Binary files differ
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect
index b53764fd97..b9ea620f2d 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US
Content-Type: charset=UTF-8;text/plain
Content-Length: 12
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect
index 5f365b42af..160bc35fda 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US
Content-Type: text/plain;charset=UTF-8
Content-Length: 12
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect
index e93c019dd5..c849514cc7 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect
@@ -1,7 +1,7 @@
OPTIONS / HTTP/1.1
Content-Length: 0
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
Accept-Language: en-US,*
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect
index da38968e9a..189e0b27ca 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect
@@ -1,7 +1,7 @@
OPTIONS /testdocument.html HTTP/1.1
Content-Length: 0
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
Accept-Language: en-US,*
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect
index 672dc60021..dd1c84c401 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect
@@ -1,7 +1,7 @@
DELETE /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect
index bc40e5ea0f..312421ba79 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect
@@ -1,7 +1,7 @@
GET /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect
index 2a642e4292..1bb5ddc979 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect
@@ -1,7 +1,7 @@
HEAD /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect
index 8c13977462..7b640a408f 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect
@@ -4,7 +4,7 @@ If-Match: "ETagNumber"
Content-Type: application/example
Content-Length: 247
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect
index 94b3016490..56455e2b23 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect
@@ -3,7 +3,7 @@ Accept-Language: en-US
Test-header: value
Test-header2: value,value2
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect
index bc40e5ea0f..312421ba79 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect
@@ -1,7 +1,7 @@
GET /testdocument.html HTTP/1.1
Accept-Language: en-US
Connection: Keep-Alive
-Accept-Encoding: gzip, deflate
+Accept-Encoding: {{Ignore}}
User-Agent: Mozilla/5.0
Host: {{ServerHostUrl}}