From a1c226ae177a005f44998341eb51e20018c77ce5 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Tue, 30 Apr 2024 22:40:45 +0200 Subject: [PATCH] @ResourceLock("port8885") added for MQTT test with server on port 8885 --- .../org/thingsboard/mqtt/integration/MqttIntegrationTest.java | 2 ++ .../org/thingsboard/mqtt/integration/server/MqttServer.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java index f0c0800c88..7f71bc58a6 100644 --- a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java +++ b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.ResourceLock; import org.thingsboard.common.util.AbstractListeningExecutor; import org.thingsboard.mqtt.MqttClient; import org.thingsboard.mqtt.MqttClientConfig; @@ -39,6 +40,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +@ResourceLock("port8885") // test MQTT server port @Slf4j public class MqttIntegrationTest { diff --git a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/server/MqttServer.java b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/server/MqttServer.java index 40663165e6..6bbdace643 100644 --- a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/server/MqttServer.java +++ b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/server/MqttServer.java @@ -46,7 +46,7 @@ public class MqttServer { private EventLoopGroup workerGroup; public void init() throws Exception { - log.info("Starting MQTT server..."); + log.info("Starting MQTT server on port {}...", mqttPort); bossGroup = new NioEventLoopGroup(); workerGroup = new NioEventLoopGroup(); ServerBootstrap b = new ServerBootstrap();