From 6e0b53fbb9362bb4f29cfea0c7ae8dc6f524abc8 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Fri, 26 Feb 2021 20:05:23 +0100 Subject: [PATCH] fix(eunit): fix emqx_tls_lib_tests --- src/emqx_tls_lib.erl | 4 ++-- test/emqx_tls_lib_tests.erl | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/emqx_tls_lib.erl b/src/emqx_tls_lib.erl index 024de699e..215f0b5ca 100644 --- a/src/emqx_tls_lib.erl +++ b/src/emqx_tls_lib.erl @@ -45,10 +45,10 @@ integral_versions([]) -> integral_versions(default_versions()); integral_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(iolist_to_binary(Desired)); +integral_versions(Desired) when is_binary(Desired) -> + integral_versions(parse_versions(Desired)); integral_versions(Desired) -> {_, Available} = lists:keyfind(available, 1, ssl:versions()), case lists:filter(fun(V) -> lists:member(V, Available) end, Desired) of diff --git a/test/emqx_tls_lib_tests.erl b/test/emqx_tls_lib_tests.erl index 452909db2..4748f5854 100644 --- a/test/emqx_tls_lib_tests.erl +++ b/test/emqx_tls_lib_tests.erl @@ -53,8 +53,12 @@ tls_versions_test() -> ?assert(lists:member('tlsv1.3', emqx_tls_lib:default_versions())). tls_version_unknown_test() -> - ?assertError(#{reason := no_available_tls_version}, + ?assertEqual(emqx_tls_lib:default_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}, emqx_tls_lib:integral_versions([foo])).