Throw IllegalStateException when unknown state, and log it

1 files changed, 3 insertions, 2 deletions

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 d3447fb8774..0c2d8c9dfba 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
@@ -334,7 +334,8 @@ public class InternalStepRunner implements StepRunner {
         controller.jobController().updateTestLog(id);
 
         RunStatus status;
-        switch (controller.jobController().cloud().getStatus(testerEndpoint)) {
+        TesterCloud.Status testStatus = controller.jobController().cloud().getStatus(testerEndpoint);
+        switch (testStatus) {
             case NOT_STARTED:
                 throw new IllegalStateException("Tester reports tests not started, even though they should have!");
             case RUNNING:
@@ -349,7 +350,7 @@ public class InternalStepRunner implements StepRunner {
                 logger.log("Tests completed successfully.");
                 status = running; break;
             default:
-                throw new IllegalArgumentException("Unknown status!");
+                throw new IllegalStateException("Unknown status '" + testStatus + "'!");
         }
         return Optional.of(status);
     }