diff options
author | jonmv <venstad@gmail.com> | 2022-06-15 19:25:35 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-06-15 19:25:35 +0200 |
commit | 2a4dcbed1b6daeb5b4d30c893adf75385b1ee527 (patch) | |
tree | dfc03a37da26997e7db61b3a28c603fca3db3d60 /container-core/src | |
parent | 45fff6f26c4728861a39b36cfc332407bfe70753 (diff) |
Avoid deploying revisoins for apps without project id (no orch CD hack)
Diffstat (limited to 'container-core/src')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/di/ContainerTest.java | 9 | ||||
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java | 2 |
2 files changed, 6 insertions, 5 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 74c08b1044b..30dc4f313e4 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 @@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -194,11 +195,9 @@ public class ContainerTest extends ContainerTestBase { writeBootstrapConfigs("thrower", ComponentThrowingExceptionForMissingConfig.class); container.reloadConfig(2); - try { - getNewComponentGraph(container, currentGraph); - fail("expected exception"); - } catch (Exception ignored) { - } + assertThrows(IllegalArgumentException.class, + () -> getNewComponentGraph(container, currentGraph)); + ExecutorService exec = Executors.newFixedThreadPool(1); Future<ComponentGraph> newGraph = exec.submit(() -> getNewComponentGraph(container, currentGraph)); diff --git a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java index d459070e2bd..43b2c8ad8e6 100644 --- a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java +++ b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java @@ -17,6 +17,7 @@ import java.util.Random; * @author ollivir */ public class DirConfigSource { + private final TemporaryFolder tempFolder = createTemporaryFolder(); public final ConfigSource configSource; @@ -66,4 +67,5 @@ public class DirConfigSource { } return folder; } + } |