summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-06-12 19:26:13 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-06-12 19:26:13 +0300
commitc8e3210bc5c9604a8759ab3ea28dc76d1a00d0c2 (patch)
treedf2d487e1982abd77749a4e3035eac34d9e63556 /test
parentb52796379ac465f35f5d92b901514b3cff3040c1 (diff)
parent245e3c73031f2a7c27d32daa802dd03ec5b8aec2 (diff)
downloadrabbitmq-server-git-c8e3210bc5c9604a8759ab3ea28dc76d1a00d0c2.tar.gz
Merge branch 'master' into rabbitmq-server-1257
Diffstat (limited to 'test')
-rw-r--r--test/unit_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl
index f3fec06cb4..3e92158595 100644
--- a/test/unit_SUITE.erl
+++ b/test/unit_SUITE.erl
@@ -332,7 +332,7 @@ do_decrypt_start_app(Config, Passphrase) ->
%%
%% We expect a failure *after* the decrypting has been done.
try
- rabbit:start_apps([rabbit_shovel_test])
+ rabbit:start_apps([rabbit_shovel_test], #{rabbit => temporary})
catch _:_ ->
ok
end,
@@ -359,7 +359,7 @@ decrypt_start_app_undefined(Config) ->
%%
%% We expect a failure during decryption because the passphrase is missing.
try
- rabbit:start_apps([rabbit_shovel_test])
+ rabbit:start_apps([rabbit_shovel_test], #{rabbit => temporary})
catch
exit:{bad_configuration, config_entry_decoder} -> ok;
_:_ -> exit(unexpected_exception)
@@ -379,7 +379,7 @@ decrypt_start_app_wrong_passphrase(Config) ->
%%
%% We expect a failure during decryption because the passphrase is wrong.
try
- rabbit:start_apps([rabbit_shovel_test])
+ rabbit:start_apps([rabbit_shovel_test], #{rabbit => temporary})
catch
exit:{decryption_error,_,_} -> ok;
_:_ -> exit(unexpected_exception)