Skip to content

Commit f95f2ab

Browse files
authored
Merge pull request #15816 from rabbitmq/fix-rabbit_db_binding_SUITE
rabbit_db_binding_SUITE: Enable and fix the `auto_delete` testcase
2 parents c25a2cc + 88a2f46 commit f95f2ab

1 file changed

Lines changed: 31 additions & 4 deletions

File tree

deps/rabbit/test/rabbit_db_binding_SUITE.erl

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,32 @@
99

1010
-include_lib("rabbit_common/include/rabbit.hrl").
1111
-include_lib("eunit/include/eunit.hrl").
12-
-compile(export_all).
12+
13+
-export([all/0,
14+
groups/0,
15+
init_per_suite/1,
16+
end_per_suite/1,
17+
init_per_group/2,
18+
end_per_group/2,
19+
init_per_testcase/2,
20+
end_per_testcase/2,
21+
22+
create/1, create1/1,
23+
exists/1, exists1/1,
24+
delete/1, delete1/1,
25+
auto_delete/1, auto_delete1/1,
26+
get_all/1, get_all1/1,
27+
get_all_by_vhost/1, get_all_by_vhost1/1,
28+
get_all_for_source/1, get_all_for_source1/1,
29+
get_all_for_destination/1, get_all_for_destination1/1,
30+
get_all_for_source_and_destination/1,
31+
get_all_for_source_and_destination1/1,
32+
get_all_for_source_and_destination_reverse/1,
33+
get_all_for_source_and_destination_reverse1/1,
34+
fold/1, fold1/1,
35+
match/1, match1/1,
36+
match_routing_key/1, match_routing_key1/1
37+
]).
1338

1439
-define(VHOST, <<"/">>).
1540

@@ -137,7 +162,7 @@ delete1(_Config) ->
137162
passed.
138163

139164
auto_delete(Config) ->
140-
passed = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete1, [Config]).
165+
passed = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, auto_delete1, [Config]).
141166

142167
auto_delete1(_Config) ->
143168
XName1 = rabbit_misc:r(?VHOST, exchange, <<"test-exchange1">>),
@@ -152,9 +177,11 @@ auto_delete1(_Config) ->
152177
Ret = rabbit_db_binding:delete(Binding, fun(_, _) -> ok end),
153178
?assertMatch({ok, _}, Ret),
154179
{ok, Deletions} = Ret,
155-
?assertMatch({#exchange{}, not_deleted, [#binding{}]},
180+
?assertMatch({#exchange{}, deleted, [#binding{}]},
156181
rabbit_binding:fetch_deletion(XName1, Deletions)),
157-
?assertEqual(false, rabbit_db_binding:exists(Binding)),
182+
?assertEqual(
183+
{error, {resources_missing, [{not_found, XName1}]}},
184+
rabbit_db_binding:exists(Binding)),
158185
passed.
159186

160187
get_all(Config) ->

0 commit comments

Comments
 (0)