Skip to content

Commit f143aa1

Browse files
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
1 parent 4d44aa6 commit f143aa1

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
@@ -2004,7 +2004,7 @@ end}.
20042004
[{datatype, {enum, [true, false]}}]}.
20052005

20062006
{mapping, "log.syslog.ssl_options.password", "syslog.protocol",
2007-
[{datatype, string}]}.
2007+
[{datatype, [tagged_binary, binary]}]}.
20082008

20092009
{mapping, "log.syslog.ssl_options.psk_identity", "syslog.protocol",
20102010
[{datatype, string}]}.
@@ -2999,7 +2999,7 @@ end}.
29992999
[{datatype, {enum, [true, false]}}]}.
30003000

30013001
{mapping, "amqp10_client.ssl_options.password", "amqp10_client.ssl_options.password",
3002-
[{datatype, string}]}.
3002+
[{datatype, [tagged_binary, binary]}]}.
30033003

30043004
{mapping, "amqp10_client.ssl_options.psk_identity", "amqp10_client.ssl_options.psk_identity",
30053005
[{datatype, string}]}.
@@ -3107,7 +3107,7 @@ end}.
31073107
[{datatype, {enum, [true, false]}}]}.
31083108

31093109
{mapping, "amqp_client.ssl_options.password", "amqp_client.ssl_options.password",
3110-
[{datatype, string}]}.
3110+
[{datatype, [tagged_binary, binary]}]}.
31113111

31123112
{mapping, "amqp_client.ssl_options.psk_identity", "amqp_client.ssl_options.psk_identity",
31133113
[{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
@@ -1399,7 +1399,7 @@ credential_validator.regexp = ^abc\\d+",
13991399
[{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
14001400
{certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
14011401
{keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
1402-
{password,"t0p$3kRe7"}]}]}],
1402+
{password,<<"t0p$3kRe7">>}]}]}],
14031403
[]},
14041404
{amqp_client_ssl_options_tls_versions,
14051405
"amqp_client.ssl_options.cacertfile = test/config_schema_SUITE_data/certs/ca_certificate.pem
@@ -1504,7 +1504,7 @@ credential_validator.regexp = ^abc\\d+",
15041504
[{cacertfile,"test/config_schema_SUITE_data/certs/ca_certificate.pem"},
15051505
{certfile,"test/config_schema_SUITE_data/certs/server_certificate.pem"},
15061506
{keyfile,"test/config_schema_SUITE_data/certs/server_key.pem"},
1507-
{password,"t0p$3kRe7"}]}]}],
1507+
{password,<<"t0p$3kRe7">>}]}]}],
15081508
[]},
15091509
{amqp10_client_ssl_options_tls_versions,
15101510
"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/cacert.pem"},
200200
{certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
201201
{keyfile,"test/config_schema_SUITE_data/certs/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)