Adjust tests to the new behaviour
This commit is contained in:
parent
3c95bf32e7
commit
0e743b5fe7
|
@ -307,13 +307,14 @@ vhost_update_default_queue_type_undefined(Config) ->
|
||||||
VHost = <<"update-default_queue_type-with-undefined-test">>,
|
VHost = <<"update-default_queue_type-with-undefined-test">>,
|
||||||
Description = <<"rmqfpas-105 test vhost">>,
|
Description = <<"rmqfpas-105 test vhost">>,
|
||||||
Tags = [replicate, private],
|
Tags = [replicate, private],
|
||||||
DefaultQueueType = quorum,
|
VhostDefaultQueueType = quorum,
|
||||||
|
NodeDefaultQueueType = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_queue_type, default_alias, []),
|
||||||
Trace = false,
|
Trace = false,
|
||||||
ActingUser = <<"acting-user">>,
|
ActingUser = <<"acting-user">>,
|
||||||
try
|
try
|
||||||
?assertMatch(ok, rabbit_ct_broker_helpers:add_vhost(Config, VHost)),
|
?assertMatch(ok, rabbit_ct_broker_helpers:add_vhost(Config, VHost)),
|
||||||
|
|
||||||
PutVhostArgs0 = [VHost, Description, Tags, DefaultQueueType, Trace, ActingUser],
|
PutVhostArgs0 = [VHost, Description, Tags, VhostDefaultQueueType, Trace, ActingUser],
|
||||||
?assertMatch(ok,
|
?assertMatch(ok,
|
||||||
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, put_vhost, PutVhostArgs0)),
|
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, put_vhost, PutVhostArgs0)),
|
||||||
|
|
||||||
|
@ -322,7 +323,7 @@ vhost_update_default_queue_type_undefined(Config) ->
|
||||||
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, put_vhost, PutVhostArgs1)),
|
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, put_vhost, PutVhostArgs1)),
|
||||||
|
|
||||||
V = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, lookup, [VHost]),
|
V = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, lookup, [VHost]),
|
||||||
?assertMatch(#{default_queue_type := DefaultQueueType}, vhost:get_metadata(V))
|
?assertMatch(#{default_queue_type := NodeDefaultQueueType}, vhost:get_metadata(V))
|
||||||
after
|
after
|
||||||
rabbit_ct_broker_helpers:delete_vhost(Config, VHost)
|
rabbit_ct_broker_helpers:delete_vhost(Config, VHost)
|
||||||
end.
|
end.
|
||||||
|
|
|
@ -2126,7 +2126,6 @@ definitions_vhost_metadata_test(Config) ->
|
||||||
?assertEqual(#{
|
?assertEqual(#{
|
||||||
name => VHostName,
|
name => VHostName,
|
||||||
description => Desc,
|
description => Desc,
|
||||||
default_queue_type => DQT,
|
|
||||||
tags => Tags,
|
tags => Tags,
|
||||||
metadata => Metadata
|
metadata => Metadata
|
||||||
}, VH),
|
}, VH),
|
||||||
|
|
Loading…
Reference in New Issue