]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tests: add test 430, 431 and 432 to verify the --config fix
authorDaniel Stenberg <daniel@haxx.se>
Fri, 20 Mar 2020 09:34:18 +0000 (10:34 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 20 Mar 2020 10:14:56 +0000 (11:14 +0100)
Verify the fixes in 4e0b4fee4

tests/data/Makefile.inc
tests/data/test430 [new file with mode: 0644]
tests/data/test431 [new file with mode: 0644]
tests/data/test432 [new file with mode: 0644]

index 8451bb011d916bc226f99c73fa1ca715b9486492..cfcfd936637553a50ac2751113c2afe4565d0b83 100644 (file)
@@ -65,6 +65,8 @@ test393 test394 test395 \
 test400 test401 test402 test403 test404 test405 test406 test407 test408 \
 test409 \
 \
+test430 test431 test432 \
+\
 test490 test491 test492 \
 \
 test500 test501 test502 test503 test504 test505 test506 test507 test508 \
diff --git a/tests/data/test430 b/tests/data/test430
new file mode 100644 (file)
index 0000000..d4dc530
--- /dev/null
@@ -0,0 +1,101 @@
+<testcase>
+# Derived from on https://github.com/curl/curl/issues/5120
+<info>
+<keywords>
+--next
+--config
+POST
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data1>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/1
+
+-foo-
+</data1>
+<data2>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/2
+
+-foo-
+</data2>
+<data3>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/3
+
+-foo-
+</data3>
+</reply>
+
+#
+# Client-side
+<client>
+<file1 name="log/config430-a">
+--next
+url = %HOSTIP:%HTTPPORT/4300001
+header = "a: a"
+data = "a"
+</file1>
+<file2 name="log/config430-b">
+--next
+url = %HOSTIP:%HTTPPORT/4300002
+header = "b: b"
+data = "b"
+</file2>
+<file3 name="log/config430-c">
+--next
+url = %HOSTIP:%HTTPPORT/4300003
+header = "c: c"
+data = "c"
+</file3>
+
+<server>
+http
+</server>
+ <name>
+Three -K uses with --next and --data in each
+ </name>
+ <command>
+-K log/config430-a -K log/config430-b -K log/config430-c
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol nonewline="yes">
+POST /4300001 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+a: a\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+aPOST /4300002 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+b: b\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+bPOST /4300003 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+c: c\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+c
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test431 b/tests/data/test431
new file mode 100644 (file)
index 0000000..48a1b20
--- /dev/null
@@ -0,0 +1,95 @@
+<testcase>
+# Derived from on https://github.com/curl/curl/issues/5120
+<info>
+<keywords>
+--next
+--config
+POST
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data1>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/1
+
+-foo-
+</data1>
+<data2>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/2
+
+-foo-
+</data2>
+<data3>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/3
+
+-foo-
+</data3>
+</reply>
+
+#
+# Client-side
+<client>
+<file1 name="log/config431-a">
+--next
+url = %HOSTIP:%HTTPPORT/4310001
+header = "a: a"
+data = "a"
+</file1>
+<file2 name="log/config431-b">
+--next
+url = %HOSTIP:%HTTPPORT/4310002
+header = "b: b"
+data = "b"
+</file2>
+
+<server>
+http
+</server>
+ <name>
+Two -K uses with --next and then one on cmdline
+ </name>
+ <command>
+-K log/config431-a -K log/config431-b --next -d c %HOSTIP:%HTTPPORT/4310003 -H "c: c"
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol nonewline="yes">
+POST /4310001 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+a: a\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+aPOST /4310002 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+b: b\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+bPOST /4310003 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+c: c\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+c
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test432 b/tests/data/test432
new file mode 100644 (file)
index 0000000..b3401b6
--- /dev/null
@@ -0,0 +1,100 @@
+<testcase>
+# Derived from on https://github.com/curl/curl/issues/5120
+<info>
+<keywords>
+--next
+--config
+POST
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data1>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/1
+
+-foo-
+</data1>
+<data2>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/2
+
+-foo-
+</data2>
+<data3>
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/3
+
+-foo-
+</data3>
+</reply>
+
+#
+# Client-side
+<client>
+<file1 name="log/config432">
+--next
+url = %HOSTIP:%HTTPPORT/4320001
+header = "a: a"
+data = "a"
+--next
+url = %HOSTIP:%HTTPPORT/4320002
+header = "b: b"
+data = "b"
+config = "log/config432-c"
+</file1>
+<file2 name="log/config432-c">
+--next
+url = %HOSTIP:%HTTPPORT/4320003
+header = "c: c"
+data = "c"
+</file2>
+
+<server>
+http
+</server>
+ <name>
+Use -K with --next and --config from within
+ </name>
+ <command>
+-K log/config432
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol nonewline="yes">
+POST /4320001 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+a: a\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+aPOST /4320002 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+b: b\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+bPOST /4320003 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+c: c\r
+Content-Length: 1\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+c
+</protocol>
+</verify>
+</testcase>