chore: tests in otp26

This commit is contained in:
JianBo He 2024-07-01 10:19:24 +08:00
parent 89186f46a1
commit 7e0bcd4eda
3 changed files with 9 additions and 4 deletions

View File

@ -84,7 +84,8 @@ init_per_testcase(TestCase, Config) when
fun fun
(peername, [sock]) -> {ok, {{127, 0, 0, 1}, 3456}}; (peername, [sock]) -> {ok, {{127, 0, 0, 1}, 3456}};
(sockname, [sock]) -> {ok, {{127, 0, 0, 1}, 1883}}; (sockname, [sock]) -> {ok, {{127, 0, 0, 1}, 1883}};
(peercert, [sock]) -> undefined (peercert, [sock]) -> undefined;
(peersni, [sock]) -> undefined
end end
), ),
ok = meck:expect(emqx_transport, setopts, fun(_Sock, _Opts) -> ok end), ok = meck:expect(emqx_transport, setopts, fun(_Sock, _Opts) -> ok end),

View File

@ -75,7 +75,10 @@ init_per_group(ssl, Config) ->
host => ?SERVER_NAME, host => ?SERVER_NAME,
port => 8883, port => 8883,
ssl => true, ssl => true,
ssl_opts => [{server_name_indication, binary_to_list(?SERVER_NAME)}] ssl_opts => [
{verify, verify_none},
{server_name_indication, binary_to_list(?SERVER_NAME)}
]
}, },
{ok, C} = emqtt:start_link(Opts1#{clientid => ClientId}), {ok, C} = emqtt:start_link(Opts1#{clientid => ClientId}),
case emqtt:connect(C) of case emqtt:connect(C) of
@ -93,6 +96,7 @@ init_per_group(wss, Config) ->
{transport, tls}, {transport, tls},
{protocols, [http]}, {protocols, [http]},
{transport_opts, [ {transport_opts, [
{verify, verify_none},
{server_name_indication, binary_to_list(?SERVER_NAME)}, {server_name_indication, binary_to_list(?SERVER_NAME)},
{customize_hostname_check, []} {customize_hostname_check, []}
]} ]}

View File

@ -169,7 +169,7 @@ t_header(_) ->
set_ws_opts(proxy_address_header, <<"x-forwarded-for">>), set_ws_opts(proxy_address_header, <<"x-forwarded-for">>),
set_ws_opts(proxy_port_header, <<"x-forwarded-port">>), set_ws_opts(proxy_port_header, <<"x-forwarded-port">>),
{ok, St, _} = ?ws_conn:websocket_init([ {ok, St, _} = ?ws_conn:websocket_init([
req, #{},
#{ #{
zone => default, zone => default,
limiter => limiter_cfg(), limiter => limiter_cfg(),
@ -573,7 +573,7 @@ t_shutdown(_) ->
st() -> st(#{}). st() -> st(#{}).
st(InitFields) when is_map(InitFields) -> st(InitFields) when is_map(InitFields) ->
{ok, St, _} = ?ws_conn:websocket_init([ {ok, St, _} = ?ws_conn:websocket_init([
req, #{},
#{ #{
zone => default, zone => default,
listener => {ws, default}, listener => {ws, default},