Re: svn commit: r1916809 - in /httpd/httpd/branches/2.4.x: ./ test/modules/http2/test_800_websockets.py

2024-04-05 Thread Rainer Jung 

Hi Stefan and all,

I have these additional RST in some more test cases (it seems the more 
runs I do, the more popup). Would it make sense to allow RST after EOF 
in *all* tests that look for EOF in 
modules/http2/test_800_websockets.py? WDYT?


Thanks and regards,

Rainer


Am 05.04.24 um 09:04 schrieb Stefan Eissing via dev:

Many thanks Rainer, for making this work in more diverse setups.


Am 05.04.2024 um 00:48 schrieb rj...@apache.org:

Author: rjung
Date: Thu Apr  4 22:48:03 2024
New Revision: 1916809

URL: http://svn.apache.org/viewvc?rev=1916809=rev
Log:
Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_04_non_ws_resource and
test_h2_800_09b_unsupported) due to
additional RST messages.

Backport of r1916808 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:r1916808

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=1916809=1916808=1916809=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 Thu 
Apr  4 22:48:03 2024
@@ -175,7 +175,7 @@ class TestWebSockets:
 def test_h2_800_04_non_ws_resource(self, env: H2TestEnv, ws_server):
 r, infos, frames = ws_run(env, path='/alive.json')
 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 to a URL path that sends a delayed HTTP response body
@@ -215,7 +215,7 @@ class TestWebSockets:
 r, infos, frames = ws_run(env, path='/ws/echo/',
   
authority=f'test1.{env.http_tld}:{env.http_port}')
 assert r.exit_code == 0, f'{r}'
-assert infos == ['[1] :status: 501', '[1] EOF'], f'{r}'
+assert infos == ['[1] :status: 501', '[1] EOF'] or infos == ['[1] 
:status: 501', '[1] EOF', '[1] RST'], f'{r}'

 # CONNECT and exchange a PING
 def test_h2_800_10_ws_ping(self, env: H2TestEnv, ws_server):

Re: svn commit: r1916809 - in /httpd/httpd/branches/2.4.x: ./ test/modules/http2/test_800_websockets.py

2024-04-05 Thread Stefan Eissing via dev 
Many thanks Rainer, for making this work in more diverse setups.

> Am 05.04.2024 um 00:48 schrieb rj...@apache.org:
> 
> Author: rjung
> Date: Thu Apr  4 22:48:03 2024
> New Revision: 1916809
> 
> URL: http://svn.apache.org/viewvc?rev=1916809=rev
> Log:
> Fix occasional pytest failures
> in modules/http2/test_800_websockets.py
> (test_h2_800_04_non_ws_resource and
> test_h2_800_09b_unsupported) due to
> additional RST messages.
> 
> Backport of r1916808 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:r1916808
> 
> 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=1916809=1916808=1916809=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 Thu 
> Apr  4 22:48:03 2024
> @@ -175,7 +175,7 @@ class TestWebSockets:
> def test_h2_800_04_non_ws_resource(self, env: H2TestEnv, ws_server):
> r, infos, frames = ws_run(env, path='/alive.json')
> 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 to a URL path that sends a delayed HTTP response body
> @@ -215,7 +215,7 @@ class TestWebSockets:
> r, infos, frames = ws_run(env, path='/ws/echo/',
>   
> authority=f'test1.{env.http_tld}:{env.http_port}')
> assert r.exit_code == 0, f'{r}'
> -assert infos == ['[1] :status: 501', '[1] EOF'], f'{r}'
> +assert infos == ['[1] :status: 501', '[1] EOF'] or infos == ['[1] 
> :status: 501', '[1] EOF', '[1] RST'], f'{r}'
> 
> # CONNECT and exchange a PING
> def test_h2_800_10_ws_ping(self, env: H2TestEnv, ws_server):
> 
>