Merge branch 'master' into rabbitmq-server-1246-master

2 files changed, 54 insertions, 8 deletions

diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 03a687db66..5d03ba1b13 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -310,6 +310,46 @@ tcp_listen_options.exit_on_close = false",
              {verify,verify_peer},
              {fail_if_no_peer_cert,false}]}]}],
   []},
+ {ssl_options_honor_cipher_order,
+  "listeners.ssl.1 = 5671
+   ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem
+   ssl_options.certfile   = test/config_schema_SUITE_data/certs/cert.pem
+   ssl_options.keyfile    = test/config_schema_SUITE_data/certs/key.pem
+   ssl_options.depth      = 2
+   ssl_options.verify     = verify_peer
+   ssl_options.fail_if_no_peer_cert = false
+   ssl_options.honor_cipher_order   = true",
+  [{rabbit,
+       [{ssl_listeners,[5671]},
+        {ssl_options,
+            [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
+             {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
+             {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
+             {depth,2},
+             {verify,verify_peer},
+             {fail_if_no_peer_cert, false},
+             {honor_cipher_order, true}]}]}],
+  []},
+ {ssl_options_honor_ecc_order,
+  "listeners.ssl.1 = 5671
+   ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem
+   ssl_options.certfile   = test/config_schema_SUITE_data/certs/cert.pem
+   ssl_options.keyfile    = test/config_schema_SUITE_data/certs/key.pem
+   ssl_options.depth      = 2
+   ssl_options.verify     = verify_peer
+   ssl_options.fail_if_no_peer_cert = false
+   ssl_options.honor_ecc_order      = true",
+  [{rabbit,
+       [{ssl_listeners,[5671]},
+        {ssl_options,
+            [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
+             {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
+             {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
+             {depth,2},
+             {verify,verify_peer},
+             {fail_if_no_peer_cert, false},
+             {honor_ecc_order, true}]}]}],
+  []},
  {ssl_cert_login_from,
   "ssl_cert_login_from = common_name",
   [{rabbit,[{ssl_cert_login_from,common_name}]}],
diff --git a/test/term_to_binary_compat_prop_SUITE.erl b/test/term_to_binary_compat_prop_SUITE.erl
index 6c8a92a29f..69aa63433d 100644
--- a/test/term_to_binary_compat_prop_SUITE.erl
+++ b/test/term_to_binary_compat_prop_SUITE.erl
@@ -23,6 +23,8 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("proper/include/proper.hrl").
 
+-define(ITERATIONS_TO_RUN_UNTIL_CONFIDENT, 10000).
+
 all() ->
     [
         pre_3_6_11_works,
@@ -48,20 +50,22 @@ init_per_testcase(Testcase, Config) ->
 %% If this test fails - the erlang version is not supported in
 %% RabbitMQ-3.6.10 and earlier.
 pre_3_6_11_works(Config) ->
-    Fun = fun () -> prop_pre_3_6_11_works(Config) end,
-    rabbit_ct_proper_helpers:run_proper(Fun, [], 50000).
+    Property = fun () -> prop_pre_3_6_11_works(Config) end,
+    rabbit_ct_proper_helpers:run_proper(Property, [],
+                                        ?ITERATIONS_TO_RUN_UNTIL_CONFIDENT).
 
 prop_pre_3_6_11_works(_Config) ->
     ?FORALL(Term, any(),
         begin
             Current = term_to_binary(Term),
             Compat = term_to_binary_compat:term_to_binary_1(Term),
-            Current =:= Compat
+            binary_to_term(Current) =:= binary_to_term(Compat)
         end).
 
 term_to_binary_latin_atom(Config) ->
-    Fun = fun () -> prop_term_to_binary_latin_atom(Config) end,
-    rabbit_ct_proper_helpers:run_proper(Fun, [], 10000).
+    Property = fun () -> prop_term_to_binary_latin_atom(Config) end,
+    rabbit_ct_proper_helpers:run_proper(Property, [],
+                                        ?ITERATIONS_TO_RUN_UNTIL_CONFIDENT).
 
 prop_term_to_binary_latin_atom(_Config) ->
     ?FORALL(LatinString, list(integer(0, 255)),
@@ -69,12 +73,14 @@ prop_term_to_binary_latin_atom(_Config) ->
             Length = length(LatinString),
             Atom = list_to_atom(LatinString),
             Binary = list_to_binary(LatinString),
-            <<131,100, Length:16, Binary/binary>> =:= term_to_binary_compat:term_to_binary_1(Atom)
+            <<131,100, Length:16, Binary/binary>> =:=
+                term_to_binary_compat:term_to_binary_1(Atom)
         end).
 
 queue_name_to_binary(Config) ->
-    Fun = fun () -> prop_queue_name_to_binary(Config) end,
-    rabbit_ct_proper_helpers:run_proper(Fun, [], 10000).
+    Property = fun () -> prop_queue_name_to_binary(Config) end,
+    rabbit_ct_proper_helpers:run_proper(Property, [],
+                                        ?ITERATIONS_TO_RUN_UNTIL_CONFIDENT).
 
 
 prop_queue_name_to_binary(_Config) ->