diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-04-02 17:25:40 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-04-02 17:25:40 +0100 |
| commit | d262eaf822d1eac3c226a9cf28b1fc2098bc513c (patch) | |
| tree | 0c7480b4414a7e3888a25b310a4cbd6a8d2a3a20 | |
| parent | 81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c (diff) | |
| parent | f281ea9dc16b679c85ba7aaed0657b1e83472fbf (diff) | |
| download | rabbitmq-server-git-d262eaf822d1eac3c226a9cf28b1fc2098bc513c.tar.gz | |
merge bug24842 into default
| -rw-r--r-- | src/rabbit_tests.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 55e4a6f854..9cb830e914 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -883,6 +883,8 @@ test_cluster_management() -> "invalid2@invalid"]), ok = assert_ram_node(), + ok = control_action(reset, []), + SecondaryNode = rabbit_nodes:make("hare"), case net_adm:ping(SecondaryNode) of pong -> passed = test_cluster_management2(SecondaryNode); @@ -898,7 +900,6 @@ test_cluster_management2(SecondaryNode) -> SecondaryNodeS = atom_to_list(SecondaryNode), %% make a disk node - ok = control_action(reset, []), ok = control_action(cluster, [NodeS]), ok = assert_disc_node(), %% make a ram node |