got a bug report on -F in config files, so I wrote up this test to verify

that is works... and it did! ;-)

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a8e5768ae09073388ba33a9c18c32a07198a0b29..d2534b295a936f0ad063ef6f0046243bf0e1e7e7 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -21,4 +21,4 @@ test49 test50 test51 test52 test53 test54 test55 test56 \
 test500 test501 test502 test503 test504 test136 test57 test137 test138 \
 test58 test139 test140 test141 test59 test60 test61 test142 test143 test62 \
 test63 test64 test65 test66 test144 test145 test67 test68 test41 \
-test40 test42 test69 test70
+test40 test42 test69 test70 test71

diff --git a/tests/data/test71 b/tests/data/test71
new file mode 100644 (file)
index 0000000..6a9f9e2
--- /dev/null
+++ b/tests/data/test71
@@ -0,0 +1,70 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP and -F upload in config file
+ </name>
+<stdin>
+-F name=daniel
+-F tool=curl
+-F file=@log/test9.txt
+</stdin>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/71 -K -
+</command>
+# We create this file before the command is invoked!
+<file name="log/test9.txt">
+foo-
+This is a moo-
+bar
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+</strip>
+<protocol>
+POST /we/want/71 HTTP/1.1\r
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+Host: 127.0.0.1:8999\r
+Pragma: no-cache\r
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
+Content-Length: 411\r
+Expect: 100-continue\r
+Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r
+\r
+------------------------------9ef8d6205763\r
+Content-Disposition: form-data; name="name"\r
+\r
+daniel\r
+------------------------------9ef8d6205763\r
+Content-Disposition: form-data; name="tool"\r
+\r
+curl\r
+------------------------------9ef8d6205763\r
+Content-Disposition: form-data; name="file"; filename="log/test9.txt"\r
+Content-Type: text/plain\r
+\r
+foo-
+This is a moo-
+bar
+\r
+------------------------------9ef8d6205763--\r
+</protocol>
+</verify>