Skip to content

Commit 81259cd

Browse files
committed
Validate setting permissions works
in order to troubleshoot the flake described in #12413 (comment) ``` Node: rabbit_shard2@localhost Case: amqp_system_SUITE:access_failure Reason: {error,{{badmatch,{error,134, "Unhandled exception. System.Exception: expected exception not received\n at Program.Test.accessFailure(String uri) in /home/runner/work/rabbitmq-server/rabbitmq-server/deps/rabbit/test/amqp_system_SUITE_data/fsharp-tests/Program.fs:line 477\n at Program.main(String[] argv) in /home/runner/work/rabbitmq-server/rabbitmq-server/deps/rabbit/test/amqp_system_SUITE_data/fsharp-tests/Program.fs:line 509\n"}}, [{amqp_system_SUITE,run_dotnet_test,2, [{file,"amqp_system_SUITE.erl"}, {line,257}]}, ``` (cherry picked from commit 0c905f9)
1 parent febaddf commit 81259cd

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

deps/rabbit/test/amqp_system_SUITE.erl

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -214,28 +214,32 @@ auth_failure(Config) ->
214214

215215
access_failure(Config) ->
216216
User = atom_to_binary(?FUNCTION_NAME),
217-
rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
218-
rabbit_ct_broker_helpers:set_permissions(Config, User, <<"/">>,
219-
<<".*">>, %% configure
220-
<<"^banana.*">>, %% write
221-
<<"^banana.*">> %% read
222-
),
223-
run(Config, [ {dotnet, "access_failure"} ]).
217+
ok = rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
218+
ok = rabbit_ct_broker_helpers:set_permissions(Config, User, <<"/">>,
219+
<<".*">>, %% configure
220+
<<"^banana.*">>, %% write
221+
<<"^banana.*">> %% read
222+
),
223+
run(Config, [ {dotnet, "access_failure"} ]),
224+
ok = rabbit_ct_broker_helpers:delete_user(Config, User).
225+
224226

225227
access_failure_not_allowed(Config) ->
226228
User = atom_to_binary(?FUNCTION_NAME),
227-
rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
228-
run(Config, [ {dotnet, "access_failure_not_allowed"} ]).
229+
ok = rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
230+
run(Config, [ {dotnet, "access_failure_not_allowed"} ]),
231+
ok = rabbit_ct_broker_helpers:delete_user(Config, User).
229232

230233
access_failure_send(Config) ->
231234
User = atom_to_binary(?FUNCTION_NAME),
232-
rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
233-
rabbit_ct_broker_helpers:set_permissions(Config, User, <<"/">>,
234-
<<".*">>, %% configure
235-
<<"^banana.*">>, %% write
236-
<<"^banana.*">> %% read
237-
),
238-
run(Config, [ {dotnet, "access_failure_send"} ]).
235+
ok = rabbit_ct_broker_helpers:add_user(Config, User, <<"boo">>),
236+
ok = rabbit_ct_broker_helpers:set_permissions(Config, User, <<"/">>,
237+
<<".*">>, %% configure
238+
<<"^banana.*">>, %% write
239+
<<"^banana.*">> %% read
240+
),
241+
run(Config, [ {dotnet, "access_failure_send"} ]),
242+
ok = rabbit_ct_broker_helpers:delete_user(Config, User).
239243

240244
run(Config, Flavors) ->
241245
ClientLibrary = ?config(amqp_client_library, Config),

deps/rabbit/test/amqp_system_SUITE_data/fsharp-tests/Program.fs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ module Test =
413413

414414
let invalidRoutes uri =
415415

416-
for dest, cond in
416+
for addr, cond in
417417
["/exchanges/missing", "amqp:not-found"
418418
"/fruit/orange", "amqp:invalid-field"] do
419419
use ac = connectAnon uri
@@ -428,11 +428,11 @@ module Test =
428428
let attached = new OnAttached (fun _ _ -> trySet mre)
429429

430430
let sender = new SenderLink(ac.Session, "test-sender",
431-
Target(Address = dest), attached);
431+
Target(Address = addr), attached);
432432
mre.WaitOne() |> ignore
433433

434434
try
435-
let receiver = ReceiverLink(ac.Session, "test-receiver", dest)
435+
let receiver = ReceiverLink(ac.Session, "test-receiver", addr)
436436
receiver.Close()
437437
with
438438
| :? Amqp.AmqpException as ae ->
@@ -454,11 +454,11 @@ module Test =
454454
let u = Uri uri
455455
let uri = sprintf "amqp://access_failure:boo@%s:%i" u.Host u.Port
456456
use ac = connect uri
457-
let dest = "/queues/test"
457+
let target = "/queues/test"
458458
ac.Session.add_Closed (
459459
new ClosedCallback (fun _ err -> printfn "session err %A" err.Condition
460460
))
461-
let sender = new SenderLink(ac.Session, "test-sender", dest)
461+
let sender = new SenderLink(ac.Session, "test-sender", target)
462462
sender.Send(new Message "hi", TimeSpan.FromSeconds 15.)
463463
failwith "expected exception not received"
464464
with
@@ -471,8 +471,8 @@ module Test =
471471
let u = Uri uri
472472
let uri = sprintf "amqp://access_failure:boo@%s:%i" u.Host u.Port
473473
use ac = connect uri
474-
let dest = "/queues/test"
475-
let receiver = ReceiverLink(ac.Session, "test-receiver", dest)
474+
let src = "/queues/test"
475+
let receiver = ReceiverLink(ac.Session, "test-receiver", src)
476476
receiver.Close()
477477
failwith "expected exception not received"
478478
with
@@ -485,8 +485,8 @@ module Test =
485485
let u = Uri uri
486486
let uri = sprintf "amqp://access_failure_not_allowed:boo@%s:%i" u.Host u.Port
487487
use ac = connect uri
488-
let dest = "/queues/test"
489-
let receiver = ReceiverLink(ac.Session, "test-receiver", dest)
488+
let src = "/queues/test"
489+
let receiver = ReceiverLink(ac.Session, "test-receiver", src)
490490
receiver.Close()
491491
failwith "expected exception not received"
492492
with

0 commit comments

Comments
 (0)