diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-13 13:09:31 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-13 13:09:31 +0100 |
| commit | a07127e9171142b65b7994b54fc9590f14f13f69 (patch) | |
| tree | 0c59fe2cfc261ad036e0d85447441a318859d226 /deps/rabbitmq_shovel/test | |
| parent | 3dc05df20a874b02475a564a7b25c27e6485d6db (diff) | |
| parent | f0f366f8f277f7bfe6272f4d652c788eade933b1 (diff) | |
| download | rabbitmq-server-git-a07127e9171142b65b7994b54fc9590f14f13f69.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'deps/rabbitmq_shovel/test')
| -rw-r--r-- | deps/rabbitmq_shovel/test/configuration_SUITE.erl | 13 | ||||
| -rw-r--r-- | deps/rabbitmq_shovel/test/dynamic_SUITE.erl | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/deps/rabbitmq_shovel/test/configuration_SUITE.erl b/deps/rabbitmq_shovel/test/configuration_SUITE.erl index d15871eb3c..39f3dda1fd 100644 --- a/deps/rabbitmq_shovel/test/configuration_SUITE.erl +++ b/deps/rabbitmq_shovel/test/configuration_SUITE.erl @@ -51,12 +51,10 @@ init_per_suite(Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [ {rmq_nodename_suffix, ?MODULE} ]), - Config2 = rabbit_ct_helpers:run_setup_steps(Config1, + rabbit_ct_helpers:run_setup_steps(Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()), - ok = rabbit_ct_broker_helpers:rpc(Config2, 0, - application, stop, [rabbitmq_shovel]), - Config2. + rabbit_ct_client_helpers:setup_steps() ++ + [fun stop_shovel_plugin/1]). end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config, @@ -75,6 +73,11 @@ init_per_testcase(Testcase, Config) -> end_per_testcase(Testcase, Config) -> rabbit_ct_helpers:testcase_finished(Config, Testcase). +stop_shovel_plugin(Config) -> + ok = rabbit_ct_broker_helpers:rpc(Config, 0, + application, stop, [rabbitmq_shovel]), + Config. + %% ------------------------------------------------------------------- %% Testcases. %% ------------------------------------------------------------------- diff --git a/deps/rabbitmq_shovel/test/dynamic_SUITE.erl b/deps/rabbitmq_shovel/test/dynamic_SUITE.erl index 3b057b51f2..3c89f0962a 100644 --- a/deps/rabbitmq_shovel/test/dynamic_SUITE.erl +++ b/deps/rabbitmq_shovel/test/dynamic_SUITE.erl @@ -51,10 +51,9 @@ init_per_suite(Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [ {rmq_nodename_suffix, ?MODULE} ]), - Config2 = rabbit_ct_helpers:run_setup_steps(Config1, + rabbit_ct_helpers:run_setup_steps(Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()), - Config2. + rabbit_ct_client_helpers:setup_steps()). end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config, |