Mailing List Archive

Author: rjung
Date: Sat Apr 6 10:28:21 2024
New Revision: 1916831

URL: http://svn.apache.org/viewvc?rev=1916831&view=rev
Log:
Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_03_not_found and
test_h2_800_05_non_ws_delay_resource) due to
additional RST messages.

Backport of r1916830 from trunk.

Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/test/modules/http2/test_800_websockets.py

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1916830

Modified: httpd/httpd/branches/2.4.x/test/modules/http2/test_800_websockets.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/http2/test_800_websockets.py?rev=1916831&r1=1916830&r2=1916831&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/http2/test_800_websockets.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/http2/test_800_websockets.py Sat Apr 6 10:28:21 2024
@@ -168,7 +168,7 @@ class TestWebSockets:
def test_h2_800_03_not_found(self, env: H2TestEnv, ws_server):
r, infos, frames = ws_run(env, path='/does-not-exist')
assert r.exit_code == 0, f'{r}'
- assert infos == ['[1] :status: 404', '[1] EOF'], f'{r}'
+ assert infos == ['[1] :status: 404', '[1] EOF'] or infos == ['[1] :status: 404', '[1] EOF', '[1] RST'], f'{r}'

# CONNECT to a URL path that is a normal HTTP file resource
# we do not want to receive the body of that
@@ -183,7 +183,7 @@ class TestWebSockets:
def test_h2_800_05_non_ws_delay_resource(self, env: H2TestEnv, ws_server):
r, infos, frames = ws_run(env, path='/h2test/error?body_delay=100ms')
assert r.exit_code == 0, f'{r}'
- assert infos == ['[1] :status: 502', '[1] EOF'], f'{r}'
+ assert infos == ['[1] :status: 502', '[1] EOF'] or infos == ['[1] :status: 502', '[1] EOF', '[1] RST'], f'{r}'
assert frames == b''

# CONNECT missing the sec-webSocket-version header