diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-09 15:10:14 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-09 15:10:14 +0200 |
commit | be031454f0badf6851ad8c4d9baad09626f62955 (patch) | |
tree | ee413cf3646f6669cc30662c1a0a4e27ddfe5375 /vespa-osgi-testrunner | |
parent | fa1346f02f2588de9e04fee801a75c63b0cc05db (diff) |
Don't fail if staging setup tests were executed prior to staging tests
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java index 04b4a9ec1b6..5fb7344dc74 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java @@ -78,8 +78,8 @@ public class JunitRunner extends AbstractComponent { } public void executeTests(TestDescriptor.TestCategory category, byte[] testConfig) { - if (execution != null) { - throw new RuntimeException("Test execution already in progress"); + if (execution != null && !execution.isDone()) { + throw new IllegalStateException("Test execution already in progress"); } testRuntimeProvider.initialize(testConfig); Optional<Bundle> testBundle = findTestBundle(); |