From 69f568eb1183a2a1f5148e6db34a8d42e0e52ff6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 12:03:17 +0200
Subject: Adding upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 test/modules/http2/test_104_padding.py | 42 +++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'test/modules/http2/test_104_padding.py')

diff --git a/test/modules/http2/test_104_padding.py b/test/modules/http2/test_104_padding.py
index 7b874ed..401804a 100644
--- a/test/modules/http2/test_104_padding.py
+++ b/test/modules/http2/test_104_padding.py
@@ -13,57 +13,63 @@ class TestPadding:
 
     @pytest.fixture(autouse=True, scope='class')
     def _class_scope(self, env):
+        def add_echo_handler(conf):
+            conf.add([
+                "<Location \"/h2test/echo\">",
+                "    SetHandler h2test-echo",
+                "</Location>",
+            ])
+
         conf = H2Conf(env)
         conf.start_vhost(domains=[f"ssl.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.start_vhost(domains=[f"pad0.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
         conf.add("H2Padding 0")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.start_vhost(domains=[f"pad1.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
         conf.add("H2Padding 1")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.start_vhost(domains=[f"pad2.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
         conf.add("H2Padding 2")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.start_vhost(domains=[f"pad3.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
         conf.add("H2Padding 3")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.start_vhost(domains=[f"pad8.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
         conf.add("H2Padding 8")
-        conf.add("AddHandler cgi-script .py")
+        add_echo_handler(conf)
         conf.end_vhost()
         conf.install()
         assert env.apache_restart() == 0
 
     # default paddings settings: 0 bits
-    def test_h2_104_01(self, env):
-        url = env.mkurl("https", "ssl", "/echo.py")
+    def test_h2_104_01(self, env, repeat):
+        url = env.mkurl("https", "ssl", "/h2test/echo")
         # we get 2 frames back: one with data and an empty one with EOF
         # check the number of padding bytes is as expected
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
-            assert r.results["paddings"] == [
-                frame_padding(len(data)+1, 0), 
-                frame_padding(0, 0)
-            ]
+            for i in r.results["paddings"]:
+                assert i == frame_padding(len(data)+1, 0)
 
     # 0 bits of padding
     def test_h2_104_02(self, env):
-        url = env.mkurl("https", "pad0", "/echo.py")
+        url = env.mkurl("https", "pad0", "/h2test/echo")
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
-            assert r.results["paddings"] == [0, 0]
+            for i in r.results["paddings"]:
+                assert i == 0
 
     # 1 bit of padding
     def test_h2_104_03(self, env):
-        url = env.mkurl("https", "pad1", "/echo.py")
+        url = env.mkurl("https", "pad1", "/h2test/echo")
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
@@ -72,7 +78,7 @@ class TestPadding:
 
     # 2 bits of padding
     def test_h2_104_04(self, env):
-        url = env.mkurl("https", "pad2", "/echo.py")
+        url = env.mkurl("https", "pad2", "/h2test/echo")
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
@@ -81,7 +87,7 @@ class TestPadding:
 
     # 3 bits of padding
     def test_h2_104_05(self, env):
-        url = env.mkurl("https", "pad3", "/echo.py")
+        url = env.mkurl("https", "pad3", "/h2test/echo")
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
@@ -90,7 +96,7 @@ class TestPadding:
 
     # 8 bits of padding
     def test_h2_104_06(self, env):
-        url = env.mkurl("https", "pad8", "/echo.py")
+        url = env.mkurl("https", "pad8", "/h2test/echo")
         for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
             r = env.nghttp().post_data(url, data, 5)
             assert r.response["status"] == 200
-- 
cgit v1.2.3