Skip to content

Commit adf7155

Browse files
committed
Run AllowMessageTtlTest in the integration-test workflow
Add an `integration-allow-message-ttl` target and include it in the `integration-test` aggregate so the new test runs as part of the integration suite (registering the command in Main alone does not make CI run it). Also list all per-test integration targets in `.PHONY`, which previously named only a subset.
1 parent aaa453a commit adf7155

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

src/rqm_mgmt.erl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,10 +572,14 @@ parse_batch_size(Json, Opts) ->
572572

573573
parse_batch_order(Json, Opts) ->
574574
case maps:get(<<"batch_order">>, Json, undefined) of
575-
undefined -> {ok, Opts};
576-
<<"smallest_first">> -> {ok, Opts#{batch_order => smallest_first}};
577-
<<"largest_first">> -> {ok, Opts#{batch_order => largest_first}};
578-
_ -> invalid_option(<<"batch_order">>, <<"must be \"smallest_first\" or \"largest_first\"">>)
575+
undefined ->
576+
{ok, Opts};
577+
<<"smallest_first">> ->
578+
{ok, Opts#{batch_order => smallest_first}};
579+
<<"largest_first">> ->
580+
{ok, Opts#{batch_order => largest_first}};
581+
_ ->
582+
invalid_option(<<"batch_order">>, <<"must be \"smallest_first\" or \"largest_first\"">>)
579583
end.
580584

581585
parse_queue_names(Json, Opts) ->

test/integration/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ run-example: compile
2727

2828
# integration-test
2929

30-
.PHONY: integration-test start-cluster stop-cluster integration-end-to-end integration-interrupt
30+
.PHONY: integration-test start-cluster stop-cluster \
31+
integration-end-to-end integration-interrupt integration-skip-unsuitable \
32+
integration-batch integration-empty-queue integration-already-quorum \
33+
integration-allow-message-ttl
3134

3235
rabbitmq-queue-migration-plugin: $(CURDIR)/docker/rabbitmq_queue_migration.ez
3336

@@ -37,7 +40,7 @@ start-cluster: rabbitmq-queue-migration-plugin
3740
stop-cluster:
3841
$(MAKE) -C $(CURDIR)/docker stop-cluster
3942

40-
integration-test: rabbitmq-queue-migration-plugin start-cluster integration-end-to-end integration-interrupt integration-skip-unsuitable integration-batch integration-empty-queue integration-already-quorum
43+
integration-test: rabbitmq-queue-migration-plugin start-cluster integration-end-to-end integration-interrupt integration-skip-unsuitable integration-batch integration-empty-queue integration-already-quorum integration-allow-message-ttl
4144

4245
integration-end-to-end: package
4346
java -jar $(JAR) end-to-end \
@@ -72,6 +75,11 @@ integration-already-quorum: package
7275
--hostname=localhost \
7376
--port=15672
7477

78+
integration-allow-message-ttl: package
79+
java -jar $(JAR) allow-message-ttl-test \
80+
--hostname=localhost \
81+
--port=15672
82+
7583
# formatting
7684

7785
GJF_JAR := $(CURDIR)/target/google-java-format.jar

0 commit comments

Comments
 (0)