diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-04-11 14:32:39 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-04-11 14:32:39 +0100 |
| commit | f243a5fb83b3610f7fb138805df8a4edd6a2fdb9 (patch) | |
| tree | 436ec75f8e62f8e2bafed1ae6e044a76eb253db9 | |
| parent | 500424e58a18f4edeba3ce01a7935ae791bde807 (diff) | |
| download | rabbitmq-server-git-f243a5fb83b3610f7fb138805df8a4edd6a2fdb9.tar.gz | |
delete_any instead of delete.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -207,7 +207,7 @@ start-background-node: all -rm -f $(RABBITMQ_MNESIA_DIR).pid mkdir -p $(RABBITMQ_MNESIA_DIR) setsid sh -c "$(MAKE) run-background-node > $(RABBITMQ_MNESIA_DIR)/startup_log 2> $(RABBITMQ_MNESIA_DIR)/startup_err" & - sleep 1 + sleep 5 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 82e3a3f21e..03970f7ed9 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -917,7 +917,7 @@ os_cmd(Command) -> end. gb_sets_difference(S1, S2) -> - lists:foldl(fun gb_sets:delete/2, S1, gb_sets:to_list(S2)). + lists:foldl(fun gb_sets:delete_any/2, S1, gb_sets:to_list(S2)). gb_trees_difference(T1, T2) -> - lists:foldl(fun gb_trees:delete/2, T1, gb_trees:to_list(T2)). + lists:foldl(fun gb_trees:delete_any/2, T1, gb_trees:to_list(T2)). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index e356d7ff8e..c74b8d5fab 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -2306,8 +2306,8 @@ wait_for_confirms(Unconfirmed) -> true -> ok; false -> receive {'$gen_cast', {confirm, Confirmed, _}} -> wait_for_confirms( - gb_sets:difference(Unconfirmed, - gb_sets:from_list(Confirmed))) + rabbit_misc:gb_sets_difference( + Unconfirmed, gb_sets:from_list(Confirmed))) after 5000 -> exit(timeout_waiting_for_confirm) end end. |