Преглед изворни кода

fix(eunit): fix emqx_tls_lib_tests

Zaiming Shi пре 4 година
родитељ
комит
6e0b53fbb9
2 измењених фајлова са 7 додато и 3 уклоњено
  1. 2 2
      src/emqx_tls_lib.erl
  2. 5 1
      test/emqx_tls_lib_tests.erl

+ 2 - 2
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

+ 5 - 1
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])).