diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-05-05 14:50:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-05 14:50:25 +0200 |
commit | de3985fc96f3dedea99687f47a26d33b04854959 (patch) | |
tree | 3fb4dfd4ae1aec61425d6dd7c95ebf021992717b /container-core | |
parent | f61b387b3bd3ffd0855e0fcd4181318225e24225 (diff) | |
parent | 6a2cc820577733b1d19d5616bb1ec2f92fcf56b7 (diff) |
Merge pull request #26994 from vespa-engine/jonmv/unstsable-container-graph-test
Avoid race between config thread and updating file config source
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/di/ContainerTest.java | 4 |
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()); |