* test: updated pytest test/modules/http2 suite from trunk

    with skips for cases where backports have not been done.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895945 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 8 deletions

diff --git a/test/modules/http2/test_300_interim.py b/test/modules/http2/test_300_interim.py
index b0c591d6f0..0ca674a015 100644
--- a/test/modules/http2/test_300_interim.py
+++ b/test/modules/http2/test_300_interim.py
@@ -1,13 +1,13 @@
 import pytest
 
-from h2_conf import HttpdConf
+from .env import H2Conf
 
 
-class TestStore:
+class TestInterimResponses:
 
     @pytest.fixture(autouse=True, scope='class')
     def _class_scope(self, env):
-        HttpdConf(env).add_vhost_test1().add_vhost_cgi().install()
+        H2Conf(env).add_vhost_test1().add_vhost_cgi().install()
         assert env.apache_restart() == 0
 
     def setup_method(self, method):
@@ -17,22 +17,22 @@ class TestStore:
         print("teardown_method: %s" % method.__name__)
 
     # check that we normally do not see an interim response
-    def test_300_01(self, env):
+    def test_h2_300_01(self, env):
         url = env.mkurl("https", "test1", "/index.html")
         r = env.curl_post_data(url, 'XYZ')
-        assert 200 == r.response["status"]
+        assert r.response["status"] == 200
         assert "previous" not in r.response
 
     # check that we see an interim response when we ask for it
-    def test_300_02(self, env):
+    def test_h2_300_02(self, env):
         url = env.mkurl("https", "cgi", "/echo.py")
         r = env.curl_post_data(url, 'XYZ', options=["-H", "expect: 100-continue"])
-        assert 200 == r.response["status"]
+        assert r.response["status"] == 200
         assert "previous" in r.response
         assert 100 == r.response["previous"]["status"] 
 
     # check proper answer on unexpected
-    def test_300_03(self, env):
+    def test_h2_300_03(self, env):
         url = env.mkurl("https", "cgi", "/echo.py")
         r = env.curl_post_data(url, 'XYZ', options=["-H", "expect: the-unexpected"])
         assert 417 == r.response["status"]