diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl index ce02f16c3..5653cd2d2 100644 --- a/apps/emqx/test/emqx_channel_SUITE.erl +++ b/apps/emqx/test/emqx_channel_SUITE.erl @@ -27,176 +27,6 @@ all() -> emqx_common_test_helpers:all(?MODULE). -force_gc_conf() -> - #{bytes => 16777216, count => 16000, enable => true}. - -force_shutdown_conf() -> - #{enable => true, max_heap_size => 4194304, max_mailbox_size => 1000}. - -rpc_conf() -> - #{ - async_batch_size => 256, - authentication_timeout => 5000, - call_receive_timeout => 15000, - connect_timeout => 5000, - mode => async, - port_discovery => stateless, - send_timeout => 5000, - socket_buffer => 1048576, - socket_keepalive_count => 9, - socket_keepalive_idle => 900, - socket_keepalive_interval => 75, - socket_recbuf => 1048576, - socket_sndbuf => 1048576, - tcp_client_num => 1, - tcp_server_port => 5369 - }. - -mqtt_conf() -> - #{ - await_rel_timeout => 300000, - idle_timeout => 15000, - ignore_loop_deliver => false, - keepalive_backoff => 0.75, - max_awaiting_rel => 100, - max_clientid_len => 65535, - max_inflight => 32, - max_mqueue_len => 1000, - max_packet_size => 1048576, - max_qos_allowed => 2, - max_subscriptions => infinity, - max_topic_alias => 65535, - max_topic_levels => 128, - mqueue_default_priority => lowest, - mqueue_priorities => disabled, - mqueue_store_qos0 => true, - peer_cert_as_clientid => disabled, - peer_cert_as_username => disabled, - response_information => [], - retain_available => true, - retry_interval => 30000, - server_keepalive => disabled, - session_expiry_interval => 7200000, - shared_subscription => true, - strict_mode => false, - upgrade_qos => false, - use_username_as_clientid => false, - wildcard_subscription => true - }. - -listener_mqtt_tcp_conf() -> - #{ - acceptors => 16, - zone => default, - access_rules => ["allow all"], - bind => {{0, 0, 0, 0}, 1883}, - max_connections => 1024000, - mountpoint => <<>>, - proxy_protocol => false, - proxy_protocol_timeout => 3000, - tcp_options => #{ - active_n => 100, - backlog => 1024, - buffer => 4096, - high_watermark => 1048576, - nodelay => false, - reuseaddr => true, - send_timeout => 15000, - send_timeout_close => true - } - }. - -listener_mqtt_ws_conf() -> - #{ - acceptors => 16, - zone => default, - access_rules => ["allow all"], - bind => {{0, 0, 0, 0}, 8083}, - max_connections => 1024000, - mountpoint => <<>>, - proxy_protocol => false, - proxy_protocol_timeout => 3000, - tcp_options => - #{ - active_n => 100, - backlog => 1024, - buffer => 4096, - high_watermark => 1048576, - nodelay => false, - reuseaddr => true, - send_timeout => 15000, - send_timeout_close => true - }, - websocket => - #{ - allow_origin_absence => true, - check_origin_enable => false, - check_origins => [], - compress => false, - deflate_opts => - #{ - client_max_window_bits => 15, - mem_level => 8, - server_max_window_bits => 15 - }, - fail_if_no_subprotocol => true, - idle_timeout => 86400000, - max_frame_size => infinity, - mqtt_path => "/mqtt", - mqtt_piggyback => multiple, - % should allow uppercase in config - proxy_address_header => "X-Forwarded-For", - proxy_port_header => "x-forwarded-port", - supported_subprotocols => - ["mqtt", "mqtt-v3", "mqtt-v3.1.1", "mqtt-v5"] - } - }. - -listeners_conf() -> - #{ - tcp => #{default => listener_mqtt_tcp_conf()}, - ws => #{default => listener_mqtt_ws_conf()} - }. - -limiter_conf() -> - Make = fun() -> - #{ - burst => 0, - rate => infinity - } - end, - - lists:foldl( - fun(Name, Acc) -> - Acc#{Name => Make()} - end, - #{}, - [bytes, messages, message_routing, connection, internal] - ). - -stats_conf() -> - #{enable => true}. - -zone_conf() -> - #{}. - -basic_conf() -> - #{ - force_gc => force_gc_conf(), - force_shutdown => force_shutdown_conf(), - mqtt => mqtt_conf(), - rpc => rpc_conf(), - stats => stats_conf(), - listeners => listeners_conf(), - zones => zone_conf(), - limiter => limiter_conf() - }. - -set_test_listener_confs() -> - Conf = emqx_config:get([], #{}), - emqx_config:put(basic_conf()), - Conf. - %%-------------------------------------------------------------------- %% CT Callbacks %%-------------------------------------------------------------------- @@ -242,14 +72,11 @@ init_per_testcase(_TestCase, Config) -> fun(_) -> {ok, #{is_superuser => false}} end ), ok = meck:expect(emqx_access_control, authorize, fun(_, _, _) -> allow end), - %% Set confs - OldConf = set_test_listener_confs(), emqx_common_test_helpers:start_apps([]), - [{config, OldConf} | Config]. + Config. end_per_testcase(_TestCase, Config) -> meck:unload([emqx_access_control]), - emqx_config:put(?config(config, Config)), emqx_common_test_helpers:stop_apps([]), Config. diff --git a/apps/emqx/test/emqx_connection_SUITE.erl b/apps/emqx/test/emqx_connection_SUITE.erl index de3672bf3..ea451eea5 100644 --- a/apps/emqx/test/emqx_connection_SUITE.erl +++ b/apps/emqx/test/emqx_connection_SUITE.erl @@ -57,7 +57,6 @@ init_per_suite(Config) -> ok = meck:expect(emqx_alarm, deactivate, fun(_) -> ok end), ok = meck:expect(emqx_alarm, deactivate, fun(_, _) -> ok end), - emqx_channel_SUITE:set_test_listener_confs(), emqx_common_test_helpers:start_apps([]), Config. diff --git a/apps/emqx/test/emqx_ws_connection_SUITE.erl b/apps/emqx/test/emqx_ws_connection_SUITE.erl index bc91bc0ef..06be28a9c 100644 --- a/apps/emqx/test/emqx_ws_connection_SUITE.erl +++ b/apps/emqx/test/emqx_ws_connection_SUITE.erl @@ -137,7 +137,6 @@ end_per_testcase(_, Config) -> Config. init_per_suite(Config) -> - emqx_channel_SUITE:set_test_listener_confs(), emqx_common_test_helpers:start_apps([]), Config.