Skip to content

Commit 1c6aee5

Browse files
michaelklishinmergify[bot]
authored andcommitted
Update test expectations #15808
(cherry picked from commit b9325dc)
1 parent 81fc0a8 commit 1c6aee5

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,7 @@ end}.
20122012
[{datatype, {enum, [true, false]}}]}.
20132013

20142014
{mapping, "log.syslog.ssl_options.password", "syslog.protocol",
2015-
[{datatype, string}]}.
2015+
[{datatype, [tagged_binary, binary]}]}.
20162016

20172017
{mapping, "log.syslog.ssl_options.psk_identity", "syslog.protocol",
20182018
[{datatype, string}]}.
@@ -3012,7 +3012,7 @@ end}.
30123012
[{datatype, {enum, [true, false]}}]}.
30133013

30143014
{mapping, "amqp10_client.ssl_options.password", "amqp10_client.ssl_options.password",
3015-
[{datatype, string}]}.
3015+
[{datatype, [tagged_binary, binary]}]}.
30163016

30173017
{mapping, "amqp10_client.ssl_options.psk_identity", "amqp10_client.ssl_options.psk_identity",
30183018
[{datatype, string}]}.
@@ -3120,7 +3120,7 @@ end}.
31203120
[{datatype, {enum, [true, false]}}]}.
31213121

31223122
{mapping, "amqp_client.ssl_options.password", "amqp_client.ssl_options.password",
3123-
[{datatype, string}]}.
3123+
[{datatype, [tagged_binary, binary]}]}.
31243124

31253125
{mapping, "amqp_client.ssl_options.psk_identity", "amqp_client.ssl_options.psk_identity",
31263126
[{datatype, string}]}.

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ credential_validator.regexp = ^abc\\d+",
13761376
[{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
13771377
{certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
13781378
{keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
1379-
{password,"t0p$3kRe7"}]}]}],
1379+
{password,<<"t0p$3kRe7">>}]}]}],
13801380
[]},
13811381
{amqp_client_ssl_options_tls_versions,
13821382
"amqp_client.ssl_options.cacertfile = test/config_schema_SUITE_data/certs/ca_certificate.pem
@@ -1481,7 +1481,7 @@ credential_validator.regexp = ^abc\\d+",
14811481
[{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
14821482
{certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
14831483
{keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
1484-
{password,"t0p$3kRe7"}]}]}],
1484+
{password,<<"t0p$3kRe7">>}]}]}],
14851485
[]},
14861486
{amqp10_client_ssl_options_tls_versions,
14871487
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
[{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
200200
{certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
201201
{keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
202-
{password,"t0p$3kRe7"}]}]}],
202+
{password,<<"t0p$3kRe7">>}]}]}],
203203
[]},
204204
{ssl_options_tls_versions,
205205
"auth_ldap.use_ssl = true

deps/rabbitmq_peer_discovery_etcd/test/config_schema_SUITE_data/rabbitmq_peer_discovery_etcd.snippets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{rabbit, [
7373
{cluster_formation, [
7474
{peer_discovery_etcd, [
75-
{etcd_password, "rabbitmq"}
75+
{etcd_password, <<"rabbitmq">>}
7676
]}
7777
]}
7878
]}

deps/rabbitmq_stomp/test/config_schema_SUITE_data/rabbitmq_stomp.snippets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
stomp.default_pass = guest
6767
stomp.proxy_protocol = false
6868
stomp.hide_server_info = false",
69-
[{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,"guest"}]},
69+
[{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,<<"guest">>}]},
7070
{proxy_protocol,false},{hide_server_info,false}]}],
7171
[rabbitmq_stomp]},
7272
{ssl_cert_login,
@@ -78,7 +78,7 @@
7878
stomp.default_pass = guest
7979
stomp.implicit_connect = true
8080
stomp.proxy_protocol = true",
81-
[{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,"guest"}]},
81+
[{rabbitmq_stomp,[{default_user,[{login,"guest"},{passcode,<<"guest">>}]},
8282
{implicit_connect,true},
8383
{proxy_protocol,true}]}],
8484
[rabbitmq_stomp]},

0 commit comments

Comments
 (0)