diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-10-14 14:50:28 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-10-14 14:50:28 +0200 |
| commit | ad09a27f9a80fbf596f61574cff29f1bba79bd79 (patch) | |
| tree | e1138ccd01704b2a8be079e29cc572c91753fb8a /test | |
| parent | 32762100e8b9b7a36d681fa59602c3fa9e065a31 (diff) | |
| parent | 44e7198298f984974e6c4e13e3d55d2aa685f455 (diff) | |
| download | rabbitmq-server-git-ad09a27f9a80fbf596f61574cff29f1bba79bd79.tar.gz | |
Merge branch 'stable'
Conflicts:
src/rabbit.app.src
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl index 9cef6e4106..115a1cf7b2 100644 --- a/test/unit_SUITE.erl +++ b/test/unit_SUITE.erl @@ -366,7 +366,7 @@ decrypt_start_app_file(Config) -> do_decrypt_start_app(Config, Passphrase) -> %% Configure rabbit for decrypting configuration. - application:set_env(rabbit, decoder_config, [ + application:set_env(rabbit, config_entry_decoder, [ {cipher, aes_cbc256}, {hash, sha512}, {iterations, 1000}, @@ -393,7 +393,7 @@ do_decrypt_start_app(Config, Passphrase) -> decrypt_start_app_undefined(Config) -> %% Configure rabbit for decrypting configuration. - application:set_env(rabbit, decoder_config, [ + application:set_env(rabbit, config_entry_decoder, [ {cipher, aes_cbc256}, {hash, sha512}, {iterations, 1000} @@ -407,13 +407,13 @@ decrypt_start_app_undefined(Config) -> try rabbit:start_apps([rabbit_shovel_test]) catch - exit:{bad_configuration,decoder_config} -> ok; + exit:{bad_configuration, config_entry_decoder} -> ok; _:_ -> exit(unexpected_exception) end. decrypt_start_app_wrong_passphrase(Config) -> %% Configure rabbit for decrypting configuration. - application:set_env(rabbit, decoder_config, [ + application:set_env(rabbit, config_entry_decoder, [ {cipher, aes_cbc256}, {hash, sha512}, {iterations, 1000}, |