diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-10-31 01:30:08 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-10-31 01:30:08 +0300 |
| commit | 67c9b9ce4f9e185baa89af0df7b11c8d8b1b8056 (patch) | |
| tree | bf7292b587de7757c228392bcd5bba07f96b2672 /test | |
| parent | e65e740b2a4d800bafd6d2f7e35ec5a9622a86b4 (diff) | |
| parent | afe052f5cdd8535c7d4eaec2d7c10435ca7925e7 (diff) | |
| download | rabbitmq-server-git-67c9b9ce4f9e185baa89af0df7b11c8d8b1b8056.tar.gz | |
Merge branch 'master' into rabbitmq-server-995
Diffstat (limited to 'test')
| -rw-r--r-- | test/clustering_management_SUITE.erl | 12 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 20 |
2 files changed, 28 insertions, 4 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl index 8bf8a9a8b8..e04fff2182 100644 --- a/test/clustering_management_SUITE.erl +++ b/test/clustering_management_SUITE.erl @@ -532,7 +532,9 @@ erlang_config(Config) -> ok = start_app(Hare), assert_clustered([Rabbit, Hare]), - %% If we use an invalid node name, the node fails to start. + %% If we use an invalid node type, the node fails to start. + %% The Erlang VM has stopped after previous rabbit app failure + rabbit_ct_broker_helpers:start_node(Config, Hare), ok = stop_app(Hare), ok = reset(Hare), ok = rpc:call(Hare, application, set_env, @@ -543,7 +545,7 @@ erlang_config(Config) -> %% If we use an invalid node type, the node fails to start. %% The Erlang VM has stopped after previous rabbit app failure - ok = rabbit_ct_broker_helpers:start_node(Config, Hare), + rabbit_ct_broker_helpers:start_node(Config, Hare), ok = stop_app(Hare), ok = reset(Hare), ok = rpc:call(Hare, application, set_env, @@ -554,7 +556,7 @@ erlang_config(Config) -> %% If we use an invalid cluster_nodes conf, the node fails to start. %% The Erlang VM has stopped after previous rabbit app failure - ok = rabbit_ct_broker_helpers:start_node(Config, Hare), + rabbit_ct_broker_helpers:start_node(Config, Hare), ok = stop_app(Hare), ok = reset(Hare), ok = rpc:call(Hare, application, set_env, @@ -564,7 +566,7 @@ erlang_config(Config) -> assert_not_clustered(Rabbit), %% The Erlang VM has stopped after previous rabbit app failure - ok = rabbit_ct_broker_helpers:start_node(Config, Hare), + rabbit_ct_broker_helpers:start_node(Config, Hare), ok = stop_app(Hare), ok = reset(Hare), ok = rpc:call(Hare, application, set_env, @@ -703,6 +705,8 @@ assert_failure(Fun) -> {error, Reason} -> Reason; {error_string, Reason} -> Reason; {badrpc, {'EXIT', Reason}} -> Reason; + %% Failure to start an app result in node shutdown + {badrpc, nodedown} -> nodedown; {badrpc_multi, Reason, _Nodes} -> Reason; Other -> error({expected_failure, Other}) end. diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 52babbd34a..f978ee0b41 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -143,6 +143,26 @@ tcp_listen_options.exit_on_close = false", [{rabbit, [{vm_memory_calculation_strategy, erlang}]}], []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = allocated", + [{rabbit, + [{vm_memory_calculation_strategy, allocated}]}], + []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = legacy", + [{rabbit, + [{vm_memory_calculation_strategy, legacy}]}], + []}, + {connection_max, + "connection_max = 999", + [{rabbit,[{connection_max, 999}]}], + []}, + {connection_max, + "connection_max = infinity", + [{rabbit,[{connection_max, infinity}]}], + []}, + {channel_max, + "channel_max = 16", + [{rabbit,[{channel_max, 16}]}], + []}, {listeners_tcp_ip, "listeners.tcp.1 = 192.168.1.99:5672", [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}], |