Shovel: delete duplicated tests

Test cases covered by shovel_dynamic_SUITE

Author: dcorbacho

deps/rabbitmq_shovel/test/amqp091_dynamic_SUITE.erl

@@ -490,11 +490,8 @@ change_definition(Config) ->
       end).
 
 autodelete(Config) ->
-    autodelete_case(Config, {<<"on-confirm">>, 0, 100, 0}),
-    autodelete_case(Config, {<<"on-confirm">>, 50, 50, 50}),
     autodelete_case(Config, {<<"on-confirm">>, <<"queue-length">>,  0, 100}),
     autodelete_case(Config, {<<"on-publish">>, <<"queue-length">>,  0, 100}),
-    autodelete_case(Config, {<<"on-publish">>, 50,                 50,  50}),
     %% no-ack is not compatible with explicit count
     autodelete_case(Config, {<<"no-ack">>,     <<"queue-length">>,  0, 100}),
     ok.

deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl

@@ -33,10 +33,6 @@ groups() ->
       {non_parallel_tests, [], [
           simple,
           change_definition,
-          autodelete_amqp091_src_on_confirm,
-          autodelete_amqp091_src_on_publish,
-          autodelete_amqp091_dest_on_confirm,
-          autodelete_amqp091_dest_on_publish,
           autodelete_with_rejections,
           simple_amqp10_dest,
           simple_amqp10_src,
@@ -270,89 +266,6 @@ change_definition(Config) ->
               amqp10_expect_empty(Sess, Dest2)
       end).
 
-autodelete_amqp091_src_on_confirm(Config) ->
-    autodelete_case(Config, {<<"on-confirm">>, 50, 50, 50},
-                    fun autodelete_amqp091_src/2),
-    ok.
-
-autodelete_amqp091_src_on_publish(Config) ->
-    autodelete_case(Config, {<<"on-publish">>, 50, 50, 50},
-                    fun autodelete_amqp091_src/2),
-    ok.
-
-autodelete_amqp091_dest_on_confirm(Config) ->
-    autodelete_case(Config, {<<"on-confirm">>, 50, 50, 50},
-                    fun autodelete_amqp091_dest/2),
-    ok.
-
-autodelete_amqp091_dest_on_publish(Config) ->
-    autodelete_case(Config, {<<"on-publish">>, 50, 50, 50},
-                    fun autodelete_amqp091_dest/2),
-    ok.
-
-autodelete_case(Config, Args, CaseFun) ->
-    with_amqp10_session(Config, CaseFun(Config, Args)).
-
-autodelete_do(Config, {AckMode, After, ExpSrc, ExpDest}) ->
-    Src = ?config(srcq, Config),
-    Dest = ?config(destq, Config),
-    fun (Session) ->
-            amqp10_publish(Session, Src, <<"hello">>, 100),
-            shovel_test_utils:set_param_nowait(
-              Config,
-              ?PARAM, [{<<"src-address">>,    Src},
-                       {<<"src-protocol">>,   <<"amqp10">>},
-                       {<<"src-delete-after">>, After},
-                       {<<"src-prefetch-count">>, 5},
-                       {<<"dest-address">>,   Dest},
-                       {<<"dest-protocol">>,   <<"amqp10">>},
-                       {<<"ack-mode">>,     AckMode}
-                      ]),
-            await_autodelete(Config, <<"test">>),
-            amqp10_expect_count(Session, Dest, ExpDest),
-            amqp10_expect_count(Session, Src, ExpSrc)
-    end.
-
-autodelete_amqp091_src(Config, {AckMode, After, ExpSrc, ExpDest}) ->
-    Src = ?config(srcq, Config),
-    Dest = ?config(destq, Config),
-    fun (Session) ->
-            amqp10_publish(Session, Src, <<"hello">>, 100),
-            shovel_test_utils:set_param_nowait(
-              Config,
-              ?PARAM, [{<<"src-queue">>, Src},
-                       {<<"src-protocol">>, <<"amqp091">>},
-                       {<<"src-delete-after">>, After},
-                       {<<"src-prefetch-count">>, 5},
-                       {<<"dest-address">>, Dest},
-                       {<<"dest-protocol">>, <<"amqp10">>},
-                       {<<"ack-mode">>, AckMode}
-                      ]),
-            await_autodelete(Config, <<"test">>),
-            amqp10_expect_count(Session, Dest, ExpDest),
-            amqp10_expect_count(Session, Src, ExpSrc)
-    end.
-
-autodelete_amqp091_dest(Config, {AckMode, After, ExpSrc, ExpDest}) ->
-    Src = ?config(srcq, Config),
-    Dest = ?config(destq, Config),
-    fun (Session) ->
-            amqp10_publish(Session, Src, <<"hello">>, 100),
-            shovel_test_utils:set_param_nowait(
-              Config,
-              ?PARAM, [{<<"src-address">>, Src},
-                       {<<"src-protocol">>, <<"amqp10">>},
-                       {<<"src-delete-after">>, After},
-                       {<<"src-prefetch-count">>, 5},
-                       {<<"dest-queue">>, Dest},
-                       {<<"dest-protocol">>, <<"amqp091">>},
-                       {<<"ack-mode">>, AckMode}
-                      ]),
-            await_autodelete(Config, <<"test">>),
-            amqp10_expect_count(Session, Dest, ExpDest),
-            amqp10_expect_count(Session, Src, ExpSrc)
-    end.
-
 autodelete_with_rejections(Config) ->
     Src = ?config(srcq, Config),
     Dest = ?config(destq, Config),

deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl

@@ -53,7 +53,6 @@ groups() ->
                   local_to_local_delete_after_never,
                   local_to_local_delete_after_queue_length,
                   local_to_local_delete_after_queue_length_zero,
-                  local_to_local_delete_after_number,
                   local_to_local_delete_after_with_rejections,
                   local_to_local_no_ack,
                   local_to_local_quorum_no_ack,
@@ -560,26 +559,6 @@ local_to_local_delete_after_queue_length(Config) ->
               amqp10_expect_empty(Sess, Dest)
       end).
 
-local_to_local_delete_after_number(Config) ->
-    Src = ?config(srcq, Config),
-    Dest = ?config(destq, Config),
-    with_amqp10_session(Config,
-      fun (Sess) ->
-              amqp10_publish(Sess, Src, <<"tag1">>, 5),
-              shovel_test_utils:set_param(Config, ?PARAM,
-                                          [{<<"src-protocol">>, <<"local">>},
-                                           {<<"src-queue">>, Src},
-                                           {<<"src-delete-after">>, 10},
-                                           {<<"dest-protocol">>, <<"local">>},
-                                           {<<"dest-queue">>, Dest}
-                                          ]),
-              amqp10_expect_count(Sess, Dest, 5),
-              amqp10_publish(Sess, Src, <<"tag1">>, 10),
-              amqp10_expect_count(Sess, Dest, 5),
-              await_autodelete(Config, ?PARAM),
-              amqp10_expect_empty(Sess, Dest)
-      end).
-
 local_to_local_delete_after_with_rejections(Config) ->
     Src = ?config(srcq, Config),
     Dest = ?config(destq, Config),