This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 649fa707fa Fix for sometimes failing mvn integration test (#4069)
649fa707fa is described below
commit 649fa707faf3f3b064cd15d926c2297580dfb23c
Author: Jacqueline Höllig <[email protected]>
AuthorDate: Fri Dec 19 14:32:09 2025 +0100
Fix for sometimes failing mvn integration test (#4069)
---
streampipes-integration-tests/pom.xml | 3 ---
.../integration/adapters/AdaptersIntegrationTest.java | 15 +++++++--------
.../integration/adapters/MQTTPublisherUtils.java | 7 ++++---
.../integration/adapters/MqttAdapterTLSTester.java | 7 ++++---
.../integration/adapters/MqttAdapterTester.java | 7 ++++---
.../integration/containers/MosquittoContainer.java | 2 ++
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/streampipes-integration-tests/pom.xml
b/streampipes-integration-tests/pom.xml
index 0e86d8f486..f2f23f10c7 100644
--- a/streampipes-integration-tests/pom.xml
+++ b/streampipes-integration-tests/pom.xml
@@ -155,9 +155,6 @@
<!-- Self-Signed Certificate Profile -->
<profile>
<id>selfsigned</id>
- <activation>
- <activeByDefault>true</activeByDefault> <!-- You can change this to
false if you don't want it to be active by default -->
- </activation>
<build>
<plugins>
<plugin>
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersIntegrationTest.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersIntegrationTest.java
index 9b439e2785..9a7d587a0c 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersIntegrationTest.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersIntegrationTest.java
@@ -35,19 +35,18 @@ public class AdaptersIntegrationTest {
@Test
@Order(2)
-
- public void testMqttTLSAdapter() throws Exception {
-
- try (MqttAdapterTLSTester mqttAdapterTLSTester = new
MqttAdapterTLSTester()) {
- mqttAdapterTLSTester.run();
+ public void testPulsarAdapter() throws Exception {
+ try (PulsarAdapterTester pulsarAdapterTester = new PulsarAdapterTester()) {
+ pulsarAdapterTester.run();
}
}
@Test
@Order(3)
- public void testPulsarAdapter() throws Exception {
- try (PulsarAdapterTester pulsarAdapterTester = new PulsarAdapterTester()) {
- pulsarAdapterTester.run();
+ public void testMqttTLSAdapter() throws Exception {
+
+ try (MqttAdapterTLSTester mqttAdapterTLSTester = new
MqttAdapterTLSTester()) {
+ mqttAdapterTLSTester.run();
}
}
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MQTTPublisherUtils.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MQTTPublisherUtils.java
index bb34078ca3..21c1d76d0e 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MQTTPublisherUtils.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MQTTPublisherUtils.java
@@ -35,7 +35,6 @@ public class MQTTPublisherUtils {
var objectMapper = new ObjectMapper();
events.forEach(event -> {
-
try {
var serializedEvent = objectMapper.writeValueAsBytes(event);
publisher.publish(serializedEvent);
@@ -43,8 +42,6 @@ public class MQTTPublisherUtils {
throw new RuntimeException(e);
}
});
-
- publisher.disconnect();
}
@NotNull
@@ -58,4 +55,8 @@ public class MQTTPublisherUtils {
return publisher;
}
+ public static void closeConnection(MqttPublisher publisher) {
+ publisher.disconnect();
+ }
+
}
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTLSTester.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTLSTester.java
index e4ed980655..91fc39a780 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTLSTester.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTLSTester.java
@@ -116,13 +116,14 @@ public class MqttAdapterTLSTester extends
AdapterTesterBase {
@Override
public void close() {
- if (mosquittoContainer != null) {
- mosquittoContainer.stop();
- }
+
try {
stopAdapter();
} catch (AdapterException e) {
throw new RuntimeException(e);
}
+ if (mosquittoContainer != null) {
+ mosquittoContainer.stop();
+ }
}
}
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTester.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTester.java
index 23be3ea134..8fe9e192ab 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTester.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/MqttAdapterTester.java
@@ -115,13 +115,14 @@ public class MqttAdapterTester extends AdapterTesterBase {
@Override
public void close() {
- if (mosquittoContainer != null) {
- mosquittoContainer.stop();
- }
+
try {
stopAdapter();
} catch (AdapterException e) {
throw new RuntimeException(e);
}
+ if (mosquittoContainer != null) {
+ mosquittoContainer.stop();
+ }
}
}
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/MosquittoContainer.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/MosquittoContainer.java
index 690634fed9..b4e8fedd36 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/MosquittoContainer.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/MosquittoContainer.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.integration.containers;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
public class MosquittoContainer extends GenericContainer<MosquittoContainer> {
@@ -47,6 +48,7 @@ public class MosquittoContainer extends
GenericContainer<MosquittoContainer> {
"passwd",
"/mosquitto/config/passwd",
BindMode.READ_ONLY);
+ this.waitingFor(new LogMessageWaitStrategy().withRegEx(".*mosquitto
version .* running.*\\n"));
super.start();
}
