summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/src/password_hashing_tests.erl54
-rw-r--r--test/src/rabbit_tests.erl35
2 files changed, 55 insertions, 34 deletions
diff --git a/test/src/password_hashing_tests.erl b/test/src/password_hashing_tests.erl
new file mode 100644
index 0000000000..030ff89058
--- /dev/null
+++ b/test/src/password_hashing_tests.erl
@@ -0,0 +1,54 @@
+%% The contents of this file are subject to the Mozilla Public License
+%% Version 1.1 (the "License"); you may not use this file except in
+%% compliance with the License. You may obtain a copy of the License at
+%% http://www.mozilla.org/MPL/
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+%% License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% The Original Code is RabbitMQ.
+%%
+%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved.
+%%
+
+-module(password_hashing_tests).
+
+-include("rabbit.hrl").
+
+-export([test_password_hashing/0]).
+
+test_password_hashing() ->
+ rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(),
+ application:set_env(rabbit, password_hashing_module, rabbit_password_hashing_md5),
+ rabbit_password_hashing_md5 = rabbit_password:hashing_mod(),
+ application:set_env(rabbit, password_hashing_module, rabbit_password_hashing_sha256),
+ rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(),
+
+ rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(rabbit_password_hashing_sha256),
+ rabbit_password_hashing_md5 = rabbit_password:hashing_mod(rabbit_password_hashing_md5),
+ rabbit_password_hashing_md5 = rabbit_password:hashing_mod(undefined),
+
+ rabbit_password_hashing_md5 =
+ rabbit_auth_backend_internal:hashing_module_for_user(
+ #internal_user{}),
+ rabbit_password_hashing_md5 =
+ rabbit_auth_backend_internal:hashing_module_for_user(
+ #internal_user{
+ hashing_algorithm = undefined
+ }),
+ rabbit_password_hashing_md5 =
+ rabbit_auth_backend_internal:hashing_module_for_user(
+ #internal_user{
+ hashing_algorithm = rabbit_password_hashing_md5
+ }),
+
+ rabbit_password_hashing_sha256 =
+ rabbit_auth_backend_internal:hashing_module_for_user(
+ #internal_user{
+ hashing_algorithm = rabbit_password_hashing_sha256
+ }),
+
+ passed.
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl
index b6b4287d0c..98fe080627 100644
--- a/test/src/rabbit_tests.erl
+++ b/test/src/rabbit_tests.erl
@@ -92,7 +92,7 @@ all_tests0() ->
passed = vm_memory_monitor_tests:all_tests(),
passed = credit_flow_test:test_credit_flow_settings(),
passed = on_disk_store_tunable_parameter_validation_test:test_msg_store_parameter_validation(),
- passed = test_password_hashing(),
+ passed = password_hashing_tests:test_password_hashing(),
passed.
do_if_secondary_node(Up, Down) ->
@@ -1058,39 +1058,6 @@ test_user_management() ->
passed.
-test_password_hashing() ->
- rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(),
- application:set_env(rabbit, password_hashing_module, rabbit_password_hashing_md5),
- rabbit_password_hashing_md5 = rabbit_password:hashing_mod(),
- application:set_env(rabbit, password_hashing_module, rabbit_password_hashing_sha256),
- rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(),
-
- rabbit_password_hashing_sha256 = rabbit_password:hashing_mod(rabbit_password_hashing_sha256),
- rabbit_password_hashing_md5 = rabbit_password:hashing_mod(rabbit_password_hashing_md5),
- rabbit_password_hashing_md5 = rabbit_password:hashing_mod(undefined),
-
- rabbit_password_hashing_md5 =
- rabbit_auth_backend_internal:hashing_module_for_user(
- #internal_user{}),
- rabbit_password_hashing_md5 =
- rabbit_auth_backend_internal:hashing_module_for_user(
- #internal_user{
- hashing_algorithm = undefined
- }),
- rabbit_password_hashing_md5 =
- rabbit_auth_backend_internal:hashing_module_for_user(
- #internal_user{
- hashing_algorithm = rabbit_password_hashing_md5
- }),
-
- rabbit_password_hashing_sha256 =
- rabbit_auth_backend_internal:hashing_module_for_user(
- #internal_user{
- hashing_algorithm = rabbit_password_hashing_sha256
- }),
-
- passed.
-
test_runtime_parameters() ->
rabbit_runtime_parameters_test:register(),
Good = fun(L) -> ok = control_action(set_parameter, L) end,