summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-20 11:17:40 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-20 11:17:40 +0100
commit381213af0b7b3cc3a3d898fdf77cfacf19574875 (patch)
treeff3bf7dd81908fac869593a40115cb300a46ae46
parent10c46203e5ae4cfb4cb1a36f2a73a54573a3870c (diff)
downloadrabbitmq-server-git-381213af0b7b3cc3a3d898fdf77cfacf19574875.tar.gz
check that a ram node is indeed a ram node
-rw-r--r--src/rabbit_tests.erl14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 766cad8326..adb3e3ed32 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -953,11 +953,13 @@ test_cluster_management() ->
ok = control_action(stop_app, []),
ok = control_action(force_cluster, ["invalid1@invalid",
"invalid2@invalid"]),
+ ok = assert_ram_node(),
%% join a non-existing cluster as a ram node
ok = control_action(reset, []),
ok = control_action(force_cluster, ["invalid1@invalid",
"invalid2@invalid"]),
+ ok = assert_ram_node(),
SecondaryNode = rabbit_misc:makenode("hare"),
case net_adm:ping(SecondaryNode) of
@@ -979,12 +981,14 @@ test_cluster_management2(SecondaryNode) ->
%% make a ram node
ok = control_action(reset, []),
ok = control_action(cluster, [SecondaryNodeS]),
+ ok = assert_ram_node(),
%% join cluster as a ram node
ok = control_action(reset, []),
ok = control_action(force_cluster, [SecondaryNodeS, "invalid1@invalid"]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
+ ok = assert_ram_node(),
%% change cluster config while remaining in same cluster
ok = control_action(force_cluster, ["invalid2@invalid", SecondaryNodeS]),
@@ -997,12 +1001,14 @@ test_cluster_management2(SecondaryNode) ->
"invalid2@invalid"]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
+ ok = assert_ram_node(),
%% join empty cluster as a ram node
ok = control_action(reset, []),
ok = control_action(cluster, []),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
+ ok = assert_ram_node(),
%% turn ram node into disk node
ok = control_action(reset, []),
@@ -1013,12 +1019,14 @@ test_cluster_management2(SecondaryNode) ->
%% convert a disk node into a ram node
ok = control_action(force_cluster, ["invalid1@invalid",
"invalid2@invalid"]),
+ ok = assert_ram_node(),
%% turn a disk node into a ram node
ok = control_action(reset, []),
ok = control_action(cluster, [SecondaryNodeS]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
+ ok = assert_ram_node(),
%% NB: this will log an inconsistent_database error, which is harmless
%% Turning cover on / off is OK even if we're not in general using cover,
@@ -1582,6 +1590,12 @@ clean_logs(Files, Suffix) ->
end || File <- Files],
ok.
+assert_ram_node() ->
+ case rabbit_mnesia:is_disc_node() of
+ true -> exit('not_ram_node');
+ false -> ok
+ end.
+
delete_file(File) ->
case file:delete(File) of
ok -> ok;