diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-03-09 10:11:19 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-03-09 10:15:00 +0300 |
| commit | 4527efd8f6ad129b7010c4122a211811d97794aa (patch) | |
| tree | e0e87eeaa32647a2daa4f2e0561b5b5bb157fd69 /test | |
| parent | fcf04fbdf6d3f943254a1431f0d1e4c2d1745e17 (diff) | |
| parent | b40bf8c99dbd1352e0bc04d5cff79ab81d77e786 (diff) | |
| download | rabbitmq-server-git-4527efd8f6ad129b7010c4122a211811d97794aa.tar.gz | |
Merge branch 'stable'
Conflicts:
src/rabbit_msg_store.erl
test/partitions_SUITE.erl
Diffstat (limited to 'test')
| -rw-r--r-- | test/partitions_SUITE.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/test/partitions_SUITE.erl b/test/partitions_SUITE.erl index 3f0ec419c2..8c8a772987 100644 --- a/test/partitions_SUITE.erl +++ b/test/partitions_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. %% -module(partitions_SUITE). @@ -21,10 +21,6 @@ -compile(export_all). --import(rabbit_ct_broker_helpers, [enable_dist_proxy_manager/1, - enable_dist_proxy/1, - enable_dist_proxy_on_node/3]). - %% We set ticktime to 1s and setuptime is 7s so to make sure it %% passes... -define(DELAY, 8000). @@ -34,7 +30,7 @@ -define(AWAIT_TIMEOUT, 300000). suite() -> - [{timetrap, {minutes, 60}}]. + [{timetrap, 5 * 60000}]. all() -> [ @@ -52,8 +48,8 @@ groups() -> {cluster_size_3, [], [ autoheal, autoheal_after_pause_if_all_down, - autoheal_multiple_partial_partitions, - autoheal_unexpected_finish, + autoheal_multiple_partial_partitions, + autoheal_unexpected_finish, ignore, pause_if_all_down_on_blocked, pause_if_all_down_on_down, |