Rename a function, use ?assertMatch #14079

Author: michaelklishin

deps/rabbitmq_shovel/src/rabbit_shovel_util.erl

@@ -52,12 +52,12 @@ delete_shovel(VHost, Name, ActingUser) ->
                     rabbit_log:info("Will delete runtime parameters of shovel '~ts' in virtual host '~ts'", [Name, VHost]),
                     ok = rabbit_runtime_parameters:clear(VHost, <<"shovel">>, Name, ActingUser);
                 true ->
-                    report_connot_delete_protected_shovel(Name, VHost, ShovelParameters)
+                    report_that_protected_shovel_cannot_be_deleted(Name, VHost, ShovelParameters)
             end
     end.
 
--spec report_connot_delete_protected_shovel(binary(), binary(), map() | [tuple()]) -> no_return().
-report_connot_delete_protected_shovel(Name, VHost, ShovelParameters) ->
+-spec report_that_protected_shovel_cannot_be_deleted(binary(), binary(), map() | [tuple()]) -> no_return().
+report_that_protected_shovel_cannot_be_deleted(Name, VHost, ShovelParameters) ->
     case rabbit_shovel_parameters:internal_owner(ShovelParameters) of
         undefined ->
             rabbit_misc:protocol_error(
@@ -68,7 +68,7 @@ report_connot_delete_protected_shovel(Name, VHost, ShovelParameters) ->
             rabbit_misc:protocol_error(
               resource_locked,
               "Cannot delete protected shovel '~ts' in virtual host '~ts'. It was "
-              "declared as an protected and can be deleted only by deleting the owner entity: ~ts",
+              "declared as protected, delete it with --force or delete its owner entity instead: ~ts",
               [Name, VHost, rabbit_misc:rs(IOwner)])
     end.
 

deps/rabbitmq_shovel/test/delete_shovel_command_SUITE.erl

@@ -121,19 +121,18 @@ delete_internal_owner(Config) ->
                        {<<"dest-queue">>, <<"dest">>}]),
     [A] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
     Opts = #{node => A, vhost => <<"/">>, force => false},
-    {badrpc,
-     {'EXIT',
-      {amqp_error, resource_locked,
-       "Cannot delete protected shovel 'myshovel' in virtual host '/'. "
-       "It was declared as an protected and can be deleted only by deleting the owner entity: queue 'src' in vhost '/'",
-       none}}}  = ?CMD:run([<<"myshovel">>], Opts),
+    ?assertMatch(
+      {badrpc, {'EXIT', {amqp_error, resource_locked, _, none}}},
+      ?CMD:run([<<"myshovel">>], Opts)
+    ),
     [_] = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_shovel_status,
                                        status, []),
 
     ForceOpts = #{node => A, vhost => <<"/">>, force => true},
     ok  = ?CMD:run([<<"myshovel">>], ForceOpts),
     [] = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_shovel_status,
                                        status, []).
+
 clear_param_on_different_node(Config) ->
     shovel_test_utils:set_param(
       Config,