summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-20 12:53:49 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-20 12:53:49 +0100
commit3640a79148a2bcbf07d67a2ee4cfab013901e7c0 (patch)
tree10e7584c46c3892b37a0894db296e1d2e2be1c43
parent058a11aa6b319152347fcddc2806947034770942 (diff)
downloadrabbitmq-server-git-3640a79148a2bcbf07d67a2ee4cfab013901e7c0.tar.gz
remove two resets introduced earlier
We don't need them anymore. BTW, when generating the backup db directory name, we used to just append the date (including minutes, seconds) to the current directory name. But since we do an extra move_db/0 now (when converting from disc to ram), some of the tests were fast enough to try to backup the database twice in the same second. Needless to say, this would cause an error. So, now we generate the new name as before, but if it's already used, we wait 1s and try again.
-rw-r--r--src/rabbit_tests.erl2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 46c33fc1c4..af20112068 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -998,7 +998,6 @@ test_cluster_management2(SecondaryNode) ->
ok = control_action(stop_app, []),
%% join non-existing cluster as a ram node
- ok = control_action(reset, []),
ok = control_action(force_cluster, ["invalid1@invalid",
"invalid2@invalid"]),
ok = control_action(start_app, []),
@@ -1006,7 +1005,6 @@ test_cluster_management2(SecondaryNode) ->
ok = assert_ram_node(),
%% join empty cluster as a ram node (converts to disc)
- ok = control_action(reset, []),
ok = control_action(cluster, []),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),