tests: two more HTTP/2 tests

1701 and 1702

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 00b8f8a6ed29d92fe802da7bf9266d12ee7dd843..773397e4db00e83af7eb9a7b4935a592bb8f6df3 100644 (file)
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -159,7 +159,7 @@ test1525 test1526 test1527 test1528 test1529 test1530 test1531 \
 \
 test1600 test1601 test1602 test1603 test1604 \
 \
-test1700 \
+test1700 test1701 test1702 \
 \
 test1800 test1801 \
 \

diff --git a/tests/data/test1701 b/tests/data/test1701
new file mode 100644 (file)
index 0000000..621c82d
--- /dev/null
+++ b/tests/data/test1701
@@ -0,0 +1,83 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP/2
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+http2
+</server>
+ <name>
+HTTP/2 POST with Upgrade:
+ </name>
+ <command>
+http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+^X-Forwarded-Proto:.*
+^Via:.*
+</strip>
+<protocol nonewline="yes">
+POST /1701 HTTP/1.1\r
+Host: %HOSTIP:%HTTP2PORT\r
+Accept: */*\r
+Content-Length: 10\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
+datatosend
+</protocol>
+<stdout>
+HTTP/1.1 101 Switching Protocols\r
+Connection: Upgrade\r
+Upgrade: h2c\r
+\r
+HTTP/2 200 \r
+date: Thu, 09 Nov 2010 14:49:00 GMT\r
+last-modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+etag: "21025-dc7-39462498"\r
+accept-ranges: bytes\r
+content-length: 6\r
+content-type: text/html\r
+funny-head: yesyes\r
+server: cut-out\r
+via: 1.1 nghttpx\r
+\r
+-foo-
+</stdout>
+<stripfile>
+s/^server:.*/server: cut-out\r/
+</stripfile>
+</verify>
+</testcase>

diff --git a/tests/data/test1702 b/tests/data/test1702
new file mode 100644 (file)
index 0000000..cf7f26c
--- /dev/null
+++ b/tests/data/test1702
@@ -0,0 +1,78 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP HEAD
+HTTP/2
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+http2
+</server>
+ <name>
+HTTP/2 HEAD with Upgrade:
+ </name>
+ <command>
+http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+^X-Forwarded-Proto:.*
+^Via:.*
+</strip>
+<protocol>
+HEAD /1702 HTTP/1.1\r
+Host: %HOSTIP:%HTTP2PORT\r
+Accept: */*\r
+\r
+</protocol>
+<stdout>
+HTTP/1.1 101 Switching Protocols\r
+Connection: Upgrade\r
+Upgrade: h2c\r
+\r
+HTTP/2 200 \r
+date: Thu, 09 Nov 2010 14:49:00 GMT\r
+last-modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+etag: "21025-dc7-39462498"\r
+accept-ranges: bytes\r
+content-length: 6\r
+content-type: text/html\r
+funny-head: yesyes\r
+server: cut-out\r
+via: 1.1 nghttpx\r
+\r
+</stdout>
+<stripfile>
+s/^server:.*/server: cut-out\r/
+</stripfile>
+</verify>
+</testcase>