From d16c68f1a2c2ef44550fa1c4427305937a4d5566 Mon Sep 17 00:00:00 2001 From: Tomas Dvorak Date: Tue, 5 Sep 2023 16:25:59 +0200 Subject: [PATCH] close networks and containers in tests (#16375) --- .../datanode/integration/DatanodeSecuritySetupIT.java | 6 ++++++ .../org/graylog/testing/mongodb/MongoDBContainer.java | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java b/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java index 349e9ba13a..56758ad787 100644 --- a/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java +++ b/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java @@ -30,6 +30,7 @@ import org.graylog.datanode.testinfra.DatanodeContainerizedBackend; import org.graylog2.plugin.Tools; import org.graylog2.shared.utilities.StringUtils; import org.hamcrest.Matchers; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -106,6 +107,11 @@ public class DatanodeSecuritySetupIT { }).start(); } + @AfterEach + void tearDown() { + backend.stop(); + } + @Test void testSecuredSetup() throws ExecutionException, RetryException { diff --git a/graylog2-server/src/test/java/org/graylog/testing/mongodb/MongoDBContainer.java b/graylog2-server/src/test/java/org/graylog/testing/mongodb/MongoDBContainer.java index 479ddd2cf7..015070d93c 100644 --- a/graylog2-server/src/test/java/org/graylog/testing/mongodb/MongoDBContainer.java +++ b/graylog2-server/src/test/java/org/graylog/testing/mongodb/MongoDBContainer.java @@ -72,4 +72,13 @@ public class MongoDBContainer extends GenericContainer { return "could not get info from container!"; } } + + @Override + public void close() { + super.close(); + final Network network = getNetwork(); + if(network != null) { + network.close(); + } + } }