You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2023/06/28 15:18:43 UTC

svn commit: r1910667 - /httpd/httpd/trunk/test/modules/http2/test_800_websockets.py

Author: ylavic
Date: Wed Jun 28 15:18:43 2023
New Revision: 1910667

URL: http://svn.apache.org/viewvc?rev=1910667&view=rev
Log:
test_800_websockets: AH10467 is an expected error for the _fail_proto test.

So ignore it, and move the _fail_proto test first to avoid messing up with
the error logs of the other tests.


Modified:
    httpd/httpd/trunk/test/modules/http2/test_800_websockets.py

Modified: httpd/httpd/trunk/test/modules/http2/test_800_websockets.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_800_websockets.py?rev=1910667&r1=1910666&r2=1910667&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_800_websockets.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_800_websockets.py Wed Jun 28 15:18:43 2023
@@ -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')