diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-01-05 00:27:22 +0800 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-01-05 00:27:22 +0800 |
| commit | 75bee2611c8efcbfd4bb3f464a642405f4cec0dd (patch) | |
| tree | de196a31e6d1bbbde8ea6c67713f992579608fc9 /test | |
| parent | 32587fa7f3232713a2a08f60a44ca87272467b6c (diff) | |
| parent | af06a3cc6c5d80448cf0831753f2c5b54576b18b (diff) | |
| download | rabbitmq-server-git-75bee2611c8efcbfd4bb3f464a642405f4cec0dd.tar.gz | |
Merge branch 'stable' into rabbitmq-server-1054
Diffstat (limited to 'test')
| -rw-r--r-- | test/sync_detection_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/unit_inbroker_SUITE.erl | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/test/sync_detection_SUITE.erl b/test/sync_detection_SUITE.erl index 1e0a66e8fd..3e5ed8208b 100644 --- a/test/sync_detection_SUITE.erl +++ b/test/sync_detection_SUITE.erl @@ -210,7 +210,7 @@ slave_pids(Node, Queue) -> _ -> Pids end. -%% The mnesia syncronization takes a while, but we don't want to wait for the +%% The mnesia synchronization takes a while, but we don't want to wait for the %% test to fail, since the timetrap is quite high. wait_for_sync_status(Status, Node, Queue) -> Max = 10000 / ?LOOP_RECURSION_DELAY, diff --git a/test/unit_inbroker_SUITE.erl b/test/unit_inbroker_SUITE.erl index f80f83c391..44d19d0601 100644 --- a/test/unit_inbroker_SUITE.erl +++ b/test/unit_inbroker_SUITE.erl @@ -250,9 +250,21 @@ orelse Group =:= backing_queue_embed_limit_1024 -> end_per_group1(_, Config) -> Config. +init_per_testcase(Testcase, Config) when Testcase == variable_queue_requeue; + Testcase == variable_queue_fold -> + ok = rabbit_ct_broker_helpers:rpc( + Config, 0, application, set_env, + [rabbit, queue_explicit_gc_run_operation_threshold, 0]), + rabbit_ct_helpers:testcase_started(Config, Testcase); init_per_testcase(Testcase, Config) -> rabbit_ct_helpers:testcase_started(Config, Testcase). +end_per_testcase(Testcase, Config) when Testcase == variable_queue_requeue; + Testcase == variable_queue_fold -> + ok = rabbit_ct_broker_helpers:rpc( + Config, 0, application, set_env, + [rabbit, queue_explicit_gc_run_operation_threshold, 1000]), + rabbit_ct_helpers:testcase_finished(Config, Testcase); end_per_testcase(Testcase, Config) -> rabbit_ct_helpers:testcase_finished(Config, Testcase). |