]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
test_800_websockets: AH10467 is an expected error for the _fail_proto test.
authorYann Ylavic <ylavic@apache.org>
Wed, 28 Jun 2023 15:18:43 +0000 (15:18 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 28 Jun 2023 15:18:43 +0000 (15:18 +0000)
So ignore it, and move the _fail_proto test first to avoid messing up with
the error logs of the other tests.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910667 13f79535-47bb-0310-9956-ffa450edef68

test/modules/http2/test_800_websockets.py

index 754ac00d62468b2746c3222eaa39e5ab8c5ea795..848d1f4bdb6192fb83d1cc6a5f09e3ae0f0e1fe1 100644 (file)
@@ -145,20 +145,21 @@ class TestWebSockets:
             yield
             p.terminate()
 
+    # CONNECT with invalid :protocol header, must fail
+    def test_h2_800_01_fail_proto(self, env: H2TestEnv, ws_server):
+        r, infos, frames = ws_run(env, path='/ws/echo/', scenario='fail-proto')
+        assert r.exit_code == 0, f'{r}'
+        assert infos == ['[1] :status: 501', '[1] EOF'], f'{r}'
+        env.httpd_error_log.ignore_recent()
+
     # a correct CONNECT, send CLOSE, expect CLOSE, basic success
-    def test_h2_800_01_ws_empty(self, env: H2TestEnv, ws_server):
+    def test_h2_800_02_ws_empty(self, env: H2TestEnv, ws_server):
         r, infos, frames = ws_run(env, path='/ws/echo/')
         assert r.exit_code == 0, f'{r}'
         assert infos == ['[1] :status: 200', '[1] EOF'], f'{r}'
         assert len(frames) == 1, f'{frames}'
         assert frames[0].opcode == WsFrame.CLOSE, f'{frames}'
 
-    # CONNECT with invalid :protocol header, must fail
-    def test_h2_800_02_fail_proto(self, env: H2TestEnv, ws_server):
-        r, infos, frames = ws_run(env, path='/ws/echo/', scenario='fail-proto')
-        assert r.exit_code == 0, f'{r}'
-        assert infos == ['[1] :status: 501', '[1] EOF'], f'{r}'
-
     # CONNECT to a URL path that does not exist on the server
     def test_h2_800_03_not_found(self, env: H2TestEnv, ws_server):
         r, infos, frames = ws_run(env, path='/does-not-exist')