aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2021-04-19 14:41:37 +0200
committerLoïc Hoguin <[email protected]>2021-04-19 17:43:16 +0200
commit0e750e294c900ae6df644dedea2598e570b80b78 (patch)
tree66c897bc0d240d7e40e5285a7750c38d9190ef71
parent4a1d16242c6fa9865fd7499d301d90b9ca65d6b1 (diff)
downloadranch-0e750e294c900ae6df644dedea2598e570b80b78.tar.gz
ranch-0e750e294c900ae6df644dedea2598e570b80b78.tar.bz2
ranch-0e750e294c900ae6df644dedea2598e570b80b78.zip
Unconditionally run tests that use tracing
-rw-r--r--test/acceptor_SUITE.erl40
-rw-r--r--test/sendfile_SUITE.erl6
2 files changed, 5 insertions, 41 deletions
diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl
index acd19a1..6ca9bd3 100644
--- a/test/acceptor_SUITE.erl
+++ b/test/acceptor_SUITE.erl
@@ -1120,13 +1120,7 @@ tcp_set_max_connections(_) ->
ok = terminate_loop(stop, Pids1 ++ Pids2),
ok = ranch:stop_listener(Name).
-tcp_set_max_connections_clean(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_tcp_set_max_connections_clean(Config)
- end.
-
-do_tcp_set_max_connections_clean(_) ->
+tcp_set_max_connections_clean(_) ->
doc("Ensure that setting max_connections does not crash any process."),
Name = name(),
{ok, ListSupPid} = ranch:start_listener(Name,
@@ -1361,13 +1355,7 @@ supervisor_changed_options_restart(_) ->
{'EXIT', _} = begin catch ranch:get_port(Name) end,
ok.
-supervisor_clean_child_restart(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_supervisor_clean_child_restart(Config)
- end.
-
-do_supervisor_clean_child_restart(_) ->
+supervisor_clean_child_restart(_) ->
doc("Verify that only the relevant parts of the supervision tree restarted "
"when the listening socket is closed."),
Name = name(),
@@ -1408,13 +1396,7 @@ do_supervisor_clean_child_restart(_) ->
ok = clean_traces(),
ok = ranch:stop_listener(Name).
-supervisor_clean_restart(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_supervisor_clean_restart(Config)
- end.
-
-do_supervisor_clean_restart(_) ->
+supervisor_clean_restart(_) ->
doc("Verify that killing ranch_conns_sup does not crash everything "
"and that it restarts properly."),
Name = name(),
@@ -1449,13 +1431,7 @@ do_supervisor_clean_restart(_) ->
ok = clean_traces(),
ok = ranch:stop_listener(Name).
-supervisor_conns_alive(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_supervisor_conns_alive(Config)
- end.
-
-do_supervisor_conns_alive(_) ->
+supervisor_conns_alive(_) ->
doc("Ensure that active connections stay open when the listening socket gets closed."),
Name = name(),
{module, ranch_tcp} = code:ensure_loaded(ranch_tcp),
@@ -1521,13 +1497,7 @@ supervisor_protocol_start_link_crash(_) ->
ConnsSups = ranch_server:get_connections_sups(Name),
ok = ranch:stop_listener(Name).
-supervisor_server_recover_state(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_supervisor_server_recover_state(Config)
- end.
-
-do_supervisor_server_recover_state(_) ->
+supervisor_server_recover_state(_) ->
doc("Ensure that when ranch_server crashes and restarts, it recovers "
"its state and continues monitoring the same processes."),
Name = name(),
diff --git a/test/sendfile_SUITE.erl b/test/sendfile_SUITE.erl
index d8c4ab9..ca3242c 100644
--- a/test/sendfile_SUITE.erl
+++ b/test/sendfile_SUITE.erl
@@ -228,12 +228,6 @@ rawfile_range_small(Config) ->
ok = Transport:close(Server).
ssl_chunk_size(Config) ->
- case code:is_module_native(?MODULE) of
- true -> doc("This test uses tracing and is not compatible with native code.");
- false -> do_ssl_chunk_size(Config)
- end.
-
-do_ssl_chunk_size(Config) ->
doc("Use sendfile with SSL. Ensure the sendfile fallback respects the chunk size."),
Transport = config(transport, Config),
Filename = config(filename, Config),