diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java index ec6f21e4f53..1dddcbcc461 100644 --- a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java +++ b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java @@ -20,7 +20,7 @@ import java.util.Set; * <p> * This registry supports the <i>freeze</i> pattern - changes can be made * to this registry until {@link #freeze} is called. Subsequent change attempts will cause an - * exception. Freezing a registry after building makes it possible toi avoid locking and memory + * exception. Freezing a registry after building makes it possible to avoid locking and memory * synchronization on lookups. * * @author bratseth diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index ddf89e2f376..8563375ab5c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -640,6 +640,7 @@ public class InternalStepRunner implements StepRunner { return Optional.of(testFailure); case ERROR: logger.log(INFO, "Tester failed running its tests!"); + controller.jobController().updateTestReport(id); return Optional.of(error); case SUCCESS: logger.log("Tests completed successfully."); 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 d1acc4faf0f..d0f3b879fec 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 @@ -238,8 +238,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner { } } catch (InterruptedException|ExecutionException e) { logger.log(Level.WARNING, "Error while getting test report", e); - // Return FAILURE to enforce getting the test report from the caller. - return TestRunner.Status.FAILURE; + return TestRunner.Status.ERROR; } } |