yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(eunit): fix emqx_tls_lib_tests

This commit is contained in:
Zaiming Shi 2021-02-26 20:05:23 +01:00 committed by Shawn
parent 534b6c0062
commit 6e0b53fbb9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqx_tls_lib.erl
View File

@ -45,10 +45,10 @@ integral_versions([]) ->
integral_versions(default_versions()); integral_versions(default_versions());
integral_versions(<<>>) -> integral_versions(<<>>) ->
integral_versions(default_versions()); integral_versions(default_versions());
integral_versions(Desired) when is_binary(Desired) ->
integral_versions(parse_versions(Desired));
integral_versions(Desired) when ?IS_STRING(Desired) -> integral_versions(Desired) when ?IS_STRING(Desired) ->
integral_versions(iolist_to_binary(Desired)); integral_versions(iolist_to_binary(Desired));
integral_versions(Desired) when is_binary(Desired) ->
integral_versions(parse_versions(Desired));
integral_versions(Desired) -> integral_versions(Desired) ->
{_, Available} = lists:keyfind(available, 1, ssl:versions()), {_, Available} = lists:keyfind(available, 1, ssl:versions()),
case lists:filter(fun(V) -> lists:member(V, Available) end, Desired) of case lists:filter(fun(V) -> lists:member(V, Available) end, Desired) of

6
test/emqx_tls_lib_tests.erl
View File

@ -53,8 +53,12 @@ tls_versions_test() ->
?assert(lists:member('tlsv1.3', emqx_tls_lib:default_versions())). ?assert(lists:member('tlsv1.3', emqx_tls_lib:default_versions())).
tls_version_unknown_test() -> tls_version_unknown_test() ->
?assertError(#{reason := no_available_tls_version}, ?assertEqual(emqx_tls_lib:default_versions(),
emqx_tls_lib:integral_versions([])), emqx_tls_lib:integral_versions([])),
?assertEqual(emqx_tls_lib:default_versions(),
emqx_tls_lib:integral_versions(<<>>)),
?assertEqual(emqx_tls_lib:default_versions(),
emqx_tls_lib:integral_versions("foo")),
?assertError(#{reason := no_available_tls_version}, ?assertError(#{reason := no_available_tls_version},
emqx_tls_lib:integral_versions([foo])). emqx_tls_lib:integral_versions([foo])).