[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 84/153: Split non-portable part off test 1133
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 84/153: Split non-portable part off test 1133 |
Date: |
Tue, 11 Sep 2018 12:52:35 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 41dabac76106e8a4bc667fd7102c12b5bec10056
Author: Marcel Raad <address@hidden>
AuthorDate: Wed Aug 8 22:43:27 2018 +0200
Split non-portable part off test 1133
Split off testing file names with double quotes into new test 1158.
Disable it for MSYS using a precheck as it doesn't support file names
with double quotes (but Cygwin does, for example).
Fixes https://github.com/curl/curl/issues/2796
Closes https://github.com/curl/curl/pull/2854
---
tests/data/Makefile.inc | 2 +-
tests/data/test1133 | 12 ++++++------
tests/data/{test1133 => test1158} | 35 +++++++++++++++--------------------
3 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index b1d9544fd..66d86a6cd 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -127,7 +127,7 @@ test1120 test1121 test1122 test1123 test1124 test1125
test1126 test1127 \
test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
-test1152 test1153 test1154 test1155 test1156 test1157 \
+test1152 test1153 test1154 test1155 test1156 test1157 test1158 \
\
test1160 test1161 test1162 test1163 test1164 \
test1170 test1171 \
diff --git a/tests/data/test1133 b/tests/data/test1133
index b8ed56b2d..d71155eda 100644
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -26,10 +26,10 @@ http
HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
</name>
<command>
-http://%HOSTIP:%HTTPPORT/we/want/1133 -F
"address@hidden"log/test1133,a\\\"nd;.txt\";type=mo/foo;filename=\"faker,and;.txt\""
-F 'file2=@"log/test1133,a\"nd;.txt"' -F
'file3=@"log/test1133,a\"nd;.txt";type=m/f,"log/test1133,a\"nd;.txt"' -F
a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b="
\\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
+http://%HOSTIP:%HTTPPORT/we/want/1133 -F
"address@hidden"log/test1133,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\""
-F 'file2=@"log/test1133,and;.txt"' -F
'file3=@"log/test1133,and;.txt";type=m/f,"log/test1133,and;.txt"' -F
a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b="
\\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
</command>
# We create this file before the command is invoked!
-<file name=log/test1133,a"nd;.txt>
+<file name=log/test1133,and;.txt>
foo bar
This is a bar foo
bar
@@ -47,7 +47,7 @@ POST /we/want/1133 HTTP/1.1
User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6
zlib/1.1.3
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 1270
+Content-Length: 1264
Expect: 100-continue
Content-Type: multipart/form-data;
boundary=----------------------------24e78000bd32
@@ -61,7 +61,7 @@ bar
foo
------------------------------24e78000bd32
-Content-Disposition: form-data; name="file2"; filename="test1133,a\"nd;.txt"
+Content-Disposition: form-data; name="file2"; filename="test1133,and;.txt"
Content-Type: text/plain
foo bar
@@ -73,7 +73,7 @@ foo
Content-Disposition: form-data; name="file3"
Content-Type: multipart/mixed;
boundary=----------------------------7f0e85a48b0b
-Content-Disposition: attachment; filename="test1133,a\"nd;.txt"
+Content-Disposition: attachment; filename="test1133,and;.txt"
Content-Type: m/f
foo bar
@@ -81,7 +81,7 @@ This is a bar foo
bar
foo
-Content-Disposition: attachment; filename="test1133,a\"nd;.txt"
+Content-Disposition: attachment; filename="test1133,and;.txt"
Content-Type: text/plain
foo bar
diff --git a/tests/data/test1133 b/tests/data/test1158
similarity index 55%
copy from tests/data/test1133
copy to tests/data/test1158
index b8ed56b2d..62adc579d 100644
--- a/tests/data/test1133
+++ b/tests/data/test1158
@@ -22,14 +22,17 @@ blablabla
<server>
http
</server>
- <name>
-HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
- </name>
- <command>
-http://%HOSTIP:%HTTPPORT/we/want/1133 -F
"address@hidden"log/test1133,a\\\"nd;.txt\";type=mo/foo;filename=\"faker,and;.txt\""
-F 'file2=@"log/test1133,a\"nd;.txt"' -F
'file3=@"log/test1133,a\"nd;.txt";type=m/f,"log/test1133,a\"nd;.txt"' -F
a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b="
\\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
+<name>
+HTTP RFC1867-type formposting with filename containing '"'
+</name>
+<command>
+http://%HOSTIP:%HTTPPORT/we/want/1158 -F
"address@hidden"log/test1158\\\".txt\";type=mo/foo;filename=\"test1158\\\".txt\""
-F 'file2=@"log/test1158\".txt"' -F
'file3=@"log/test1158\".txt";type=m/f,"log/test1158\".txt"'
</command>
+<precheck>
+perl -e "print 'Test requires a system supporting double quotes in file names'
if ($^O eq 'msys');"
+</precheck>
# We create this file before the command is invoked!
-<file name=log/test1133,a"nd;.txt>
+<file name=log/test1158".txt>
foo bar
This is a bar foo
bar
@@ -43,16 +46,15 @@ foo
^(User-Agent:|Content-Type: multipart/form-data;|Content-Type:
multipart/mixed; boundary=|-------).*
</strip>
<protocol>
-POST /we/want/1133 HTTP/1.1
+POST /we/want/1158 HTTP/1.1
User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6
zlib/1.1.3
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 1270
-Expect: 100-continue
+Content-Length: 954
Content-Type: multipart/form-data;
boundary=----------------------------24e78000bd32
------------------------------24e78000bd32
-Content-Disposition: form-data; name="file"; filename="faker,and;.txt"
+Content-Disposition: form-data; name="file"; filename="test1158\".txt"
Content-Type: mo/foo
foo bar
@@ -61,7 +63,7 @@ bar
foo
------------------------------24e78000bd32
-Content-Disposition: form-data; name="file2"; filename="test1133,a\"nd;.txt"
+Content-Disposition: form-data; name="file2"; filename="test1158\".txt"
Content-Type: text/plain
foo bar
@@ -73,7 +75,7 @@ foo
Content-Disposition: form-data; name="file3"
Content-Type: multipart/mixed;
boundary=----------------------------7f0e85a48b0b
-Content-Disposition: attachment; filename="test1133,a\"nd;.txt"
+Content-Disposition: attachment; filename="test1158\".txt"
Content-Type: m/f
foo bar
@@ -81,7 +83,7 @@ This is a bar foo
bar
foo
-Content-Disposition: attachment; filename="test1133,a\"nd;.txt"
+Content-Disposition: attachment; filename="test1158\".txt"
Content-Type: text/plain
foo bar
@@ -90,13 +92,6 @@ bar
foo
-Content-Disposition: form-data; name="a"
-
-{"field1":"value1","field2":"value2"}
-Content-Disposition: form-data; name="b"; filename="param_b"
-Content-Type: text/foo; charset=utf-8
-
- \value1;type="whatever"
------------------------------24e78000bd32--
</protocol>
</verify>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 86/153: docs: add disallow-username-in-url.d and haproxy-protocol.d on the list, (continued)
- [GNUnet-SVN] [gnurl] 86/153: docs: add disallow-username-in-url.d and haproxy-protocol.d on the list, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 98/153: urldata: remove unused pipe_broke struct field, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 92/153: TODO: host name sections in config files, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 110/153: Remove unused definitions, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 68/153: http_proxy: Remove unused macro SELECT_TIMEOUT, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 90/153: ssh-libssh: reduce excessive verbose output about pubkey auth, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 94/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 87/153: http: fix for tiny "HTTP/0.9" response, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 88/153: travis: update to GCC 8, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 80/153: Silence GCC 8 cast-function-type warnings, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 84/153: Split non-portable part off test 1133,
gnunet <=
- [GNUnet-SVN] [gnurl] 63/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 85/153: .travis.yml: verify that man pages can be regenerated, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 79/153: CURLINFO_SIZE_UPLOAD: fix missing counter update, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 61/153: windows: implement send buffer tuning, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 77/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 83/153: projects: Improve Windows perl detection in batch scripts, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 78/153: Documentation: fix CURLOPT_SSH_COMPRESSION copy/paste bug, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 55/153: DEPRECATE: remove release date from 7.62.0, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 82/153: docs: Improve the manual pages of some callbacks, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 81/153: GCC: silence -Wcast-function-type uniformly, gnunet, 2018/09/11