[WFCORE-5386] Increase container shutdown wait time in test util clas…

…ses to ensure more reliable CI results and to minimize transient failures
wildfly · May 3, 2021 · 119e10e · 119e10e
1 parent 578b444
commit 119e10e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/controller/src/test/java/org/jboss/as/controller/test/AbstractControllerTestBase.java b/controller/src/test/java/org/jboss/as/controller/test/AbstractControllerTestBase.java
@@ -178,7 +178,7 @@ public void shutdownServiceContainer() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             } finally {

diff --git a/controller/src/test/java/org/jboss/as/controller/test/AbstractProxyControllerTest.java b/controller/src/test/java/org/jboss/as/controller/test/AbstractProxyControllerTest.java
@@ -159,7 +159,7 @@ public void shutdownServiceContainer() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             } finally {

diff --git a/...rc/test/java/org/jboss/as/domain/management/security/util/AbstractControllerTestBase.java b/...rc/test/java/org/jboss/as/domain/management/security/util/AbstractControllerTestBase.java
@@ -140,7 +140,7 @@ public void shutdownServiceContainer() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             } finally {

diff --git a/...ontroller/src/test/java/org/jboss/as/host/controller/util/AbstractControllerTestBase.java b/...ontroller/src/test/java/org/jboss/as/host/controller/util/AbstractControllerTestBase.java
@@ -203,7 +203,7 @@ public void shutdownServiceContainer() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             } finally {

diff --git a/jmx/src/test/java/org/jboss/as/jmx/test/util/AbstractControllerTestBase.java b/jmx/src/test/java/org/jboss/as/jmx/test/util/AbstractControllerTestBase.java
@@ -143,7 +143,7 @@ public void shutdownServiceContainer() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             } finally {

diff --git a/model-test/src/main/java/org/jboss/as/model/test/ModelTestKernelServicesImpl.java b/model-test/src/main/java/org/jboss/as/model/test/ModelTestKernelServicesImpl.java
@@ -293,7 +293,7 @@ public void shutdown() {
         if (container != null) {
             container.shutdown();
             try {
-                container.awaitTermination(5, TimeUnit.SECONDS);
+                container.awaitTermination(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }