Skip to content

Commit 04ddc33

Browse files
committed
Use remove use-nio profile
Only a system property is required now to choose the IO layer used in tests.
1 parent d4b1a65 commit 04ddc33

File tree

2 files changed

+4
-37
lines changed

2 files changed

+4
-37
lines changed

.github/workflows/test-supported-java-versions-main.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,13 @@ jobs:
3939
run: make deps
4040
- name: Show version
4141
run: ./mvnw --version
42-
- name: Test with NIO
42+
- name: Test with Netty
4343
run: |
44-
./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
45-
-Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
44+
./mvnw verify -Dio.layer=netty -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
45+
-Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
4646
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
4747
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
48-
-Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
49-
--no-transfer-progress \
50-
-Dnet.bytebuddy.experimental=true
51-
- name: Test with blocking IO
52-
run: |
53-
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
54-
-Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
55-
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
56-
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
57-
-Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
48+
-Dmaven.javadoc.skip=true \
5849
--no-transfer-progress \
5950
-Dnet.bytebuddy.experimental=true
6051
- name: Stop broker

pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -246,30 +246,6 @@
246246
</build>
247247
</profile>
248248

249-
<!--
250-
Profile to activate the NIO mode in the test suite:
251-
mvn verify -P use-nio
252-
-->
253-
<profile>
254-
<id>use-nio</id>
255-
<build>
256-
<plugins>
257-
<plugin>
258-
<groupId>org.apache.maven.plugins</groupId>
259-
<artifactId>maven-failsafe-plugin</artifactId>
260-
<version>${maven.failsafe.plugin.version}</version>
261-
<configuration>
262-
<systemPropertyVariables>
263-
<net.bytebuddy.experimental>true</net.bytebuddy.experimental>
264-
<use.nio>true</use.nio>
265-
</systemPropertyVariables>
266-
<argLine>${test-arguments}</argLine>
267-
</configuration>
268-
</plugin>
269-
</plugins>
270-
</build>
271-
</profile>
272-
273249
<profile>
274250
<!--
275251
The "snapshots" Maven profile is used to push release artifacts to a

0 commit comments

Comments
 (0)