Update test expectations #15808

(cherry picked from commit b9325dc)
(cherry picked from commit 1c6aee5)

# Conflicts:
#	deps/rabbitmq_auth_backend_ldap/test/config_schema_SUITE_data/rabbitmq_auth_backend_ldap.snippets

Author: michaelklishin

deps/rabbit/priv/schema/rabbit.schema

@@ -2004,7 +2004,7 @@ end}.
     [{datatype, {enum, [true, false]}}]}.
 
 {mapping, "log.syslog.ssl_options.password", "syslog.protocol",
-    [{datatype, string}]}.
+    [{datatype, [tagged_binary, binary]}]}.
 
 {mapping, "log.syslog.ssl_options.psk_identity", "syslog.protocol",
     [{datatype, string}]}.
@@ -2999,7 +2999,7 @@ end}.
     [{datatype, {enum, [true, false]}}]}.
 
 {mapping, "amqp10_client.ssl_options.password", "amqp10_client.ssl_options.password",
-    [{datatype, string}]}.
+    [{datatype, [tagged_binary, binary]}]}.
 
 {mapping, "amqp10_client.ssl_options.psk_identity", "amqp10_client.ssl_options.psk_identity",
     [{datatype, string}]}.
@@ -3107,7 +3107,7 @@ end}.
     [{datatype, {enum, [true, false]}}]}.
 
 {mapping, "amqp_client.ssl_options.password", "amqp_client.ssl_options.password",
-    [{datatype, string}]}.
+    [{datatype, [tagged_binary, binary]}]}.
 
 {mapping, "amqp_client.ssl_options.psk_identity", "amqp_client.ssl_options.psk_identity",
     [{datatype, string}]}.

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1399,7 +1399,7 @@ credential_validator.regexp = ^abc\\d+",
       [{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
        {certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
        {keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
-       {password,"t0p$3kRe7"}]}]}],
+       {password,<<"t0p$3kRe7">>}]}]}],
   []},
  {amqp_client_ssl_options_tls_versions,
   "amqp_client.ssl_options.cacertfile = test/config_schema_SUITE_data/certs/ca_certificate.pem
@@ -1504,7 +1504,7 @@ credential_validator.regexp = ^abc\\d+",
       [{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
        {certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
        {keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
-       {password,"t0p$3kRe7"}]}]}],
+       {password,<<"t0p$3kRe7">>}]}]}],
   []},
  {amqp10_client_ssl_options_tls_versions,
   "amqp10_client.ssl_options.cacertfile = test/config_schema_SUITE_data/certs/ca_certificate.pem

deps/rabbitmq_auth_backend_ldap/test/config_schema_SUITE_data/rabbitmq_auth_backend_ldap.snippets

@@ -196,10 +196,17 @@
   [{rabbitmq_auth_backend_ldap,
        [{use_ssl, true},
         {ssl_options,
+<<<<<<< HEAD
             [{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"},
              {password,"t0p$3kRe7"}]}]}],
+=======
+            [{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
+             {certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
+             {keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
+             {password,<<"t0p$3kRe7">>}]}]}],
+>>>>>>> 1c6aee5ae (Update test expectations #15808)
   []},
  {ssl_options_tls_versions,
   "auth_ldap.use_ssl = true

deps/rabbitmq_peer_discovery_etcd/test/config_schema_SUITE_data/rabbitmq_peer_discovery_etcd.snippets

@@ -72,7 +72,7 @@
             {rabbit, [
                 {cluster_formation, [
                     {peer_discovery_etcd, [
-                        {etcd_password, "rabbitmq"}
+                        {etcd_password, <<"rabbitmq">>}
                     ]}
                 ]}
             ]}

deps/rabbitmq_stomp/test/config_schema_SUITE_data/rabbitmq_stomp.snippets

@@ -66,7 +66,7 @@
    stomp.default_pass = guest
    stomp.proxy_protocol = false
    stomp.hide_server_info = false",
-  [{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,"guest"}]},
+  [{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,<<"guest">>}]},
                     {proxy_protocol,false},{hide_server_info,false}]}],
   [rabbitmq_stomp]},
  {ssl_cert_login,
@@ -78,7 +78,7 @@
    stomp.default_pass = guest
    stomp.implicit_connect = true
    stomp.proxy_protocol = true",
-  [{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,"guest"}]},
+  [{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,<<"guest">>}]},
                     {implicit_connect,true},
                     {proxy_protocol,true}]}],
   [rabbitmq_stomp]},