Browse Source

Fix ssl sendfile tests for Windows

juhlig 6 years ago
parent
commit
0523081e39
2 changed files with 13 additions and 2 deletions
  1. 11 0
      test/ranch_ct_hook.erl
  2. 2 2
      test/sendfile_SUITE.erl

+ 11 - 0
test/ranch_ct_hook.erl

@@ -22,6 +22,17 @@ init(_, _) ->
 	%% ranch_sup children.
 	application:set_env(ranch, ranch_sup_intensity, 10),
 	application:set_env(ranch, ranch_sup_period, 1),
+	ok = application:load(ssl),
+	case {os:type(), application:get_key(ssl, vsn)} of
+		%% Internal active,N is broken on Windows since
+		%% OTP 21.2/ssl 9.1.
+		%% @todo Put an upper limit on the version when
+		%% this is fixed in a future OTP version.
+		{{win32, nt}, {ok, Vsn}} when Vsn >= "9.1" ->
+			application:set_env(ssl, internal_active_n, 1);
+		_ ->
+			ok
+	end,
 	ct_helper:start([ranch]),
 	ct_helper:make_certs_in_ets(),
 	error_logger:add_report_handler(ct_helper_error_h),

+ 2 - 2
test/sendfile_SUITE.erl

@@ -279,8 +279,8 @@ sockets(Config) ->
 		Self ! {ok, Client}
 	end,
 	_ = spawn_link(Fun),
-	{ok, Server} = Transport:accept(LSocket, 500),
-	{ok, _} = Transport:handshake(Server, [], 500),
+	{ok, Server} = Transport:accept(LSocket, 5000),
+	{ok, _} = Transport:handshake(Server, [], 5000),
 	receive
 		{ok, Client} ->
 			ok = Transport:close(LSocket),