Merge pull request #26994 from vespa-engine/jonmv/unstsable-container-graph-test

Avoid race between config thread and updating file config source

1 files changed, 2 insertions, 2 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
index 9ea279ecb2b..4eb9db9f155 100644
--- a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -286,7 +286,7 @@ public class ContainerTest extends ContainerTestBase {
         Future<ComponentGraph> newGraph = exec.submit(() -> getNewComponentGraph(container, currentGraph));
         dirConfigSource.awaitConfigChecked(10_000);
         try {
-            newGraph.get(1, TimeUnit.SECONDS);
+            newGraph.get(1500, TimeUnit.MILLISECONDS);
             fail("Expected waiting for new config.");
         } catch (TimeoutException ignored) {
             // expect to time out
@@ -297,7 +297,7 @@ public class ContainerTest extends ContainerTestBase {
         container.reloadConfig(3);
 
         dirConfigSource.awaitConfigChecked(10_000);
-        assertNotNull(newGraph.get(30, TimeUnit.SECONDS));
+        assertNotNull(newGraph.get(1000, TimeUnit.MILLISECONDS));
 
         container.shutdownConfigRetriever();
         container.shutdown(newGraph.get());