Fix little things

3 files changed, 5 insertions, 4 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 eb5427a2f7e..782eda6c824 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
@@ -27,7 +27,6 @@ import com.yahoo.vespa.hosted.controller.application.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
 import com.yahoo.vespa.hosted.controller.deployment.Step.Status;
-import com.yahoo.yolean.Exceptions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -111,7 +110,7 @@ public class InternalStepRunner implements StepRunner {
             }
         }
         catch (RuntimeException e) {
-            logger.log(INFO, "Unexpected exception: " + Exceptions.toMessageString(e));
+            logger.log(INFO, "Unexpected exception running " + id, e);
             return failed;
         }
         finally {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 41c2820b620..ef413245017 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -75,7 +75,6 @@ public class InternalStepRunnerTest {
         Logger.getLogger("").getHandlers()[0].setLevel(DEBUG);
     }
 
-
     @Test
     public void canRegisterAndRunDirectly() {
         jobs.register(appId);
@@ -85,7 +84,6 @@ public class InternalStepRunnerTest {
         deployNewPlatform(new Version("7.1"));
     }
 
-
     @Test
     public void canSwitchFromScrewdriver() {
         // Deploys a default application package with default build number.
@@ -119,6 +117,7 @@ public class InternalStepRunnerTest {
                                                                            false)));
     }
 
+    /** Completely deploys a new submission. */
     private void deployNewSubmission() {
         assertTrue(app().deploymentJobs().builtInternally());
         ApplicationVersion applicationVersion = newSubmission(appId);
@@ -133,6 +132,7 @@ public class InternalStepRunnerTest {
         runJob(JobType.productionUsWest1);
     }
 
+    /** Completely deploys the given, new platform. */
     private void deployNewPlatform(Version version) {
         assertTrue(app().deploymentJobs().builtInternally());
 
@@ -147,6 +147,7 @@ public class InternalStepRunnerTest {
         runJob(JobType.productionUsWest1);
     }
 
+    /** Runs the whole of the given job, successfully. */
     private void runJob(JobType type) {
         tester.readyJobTrigger().maintain();
         RunStatus run = jobs.active().stream()
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index fe4cac08e4b..54812b6efe3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -195,6 +195,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                         : new ConfigChangeActions(Collections.emptyList(),
                                                   Collections.emptyList());
                 prepareResponse.tenant = new TenantId("tenant");
+                prepareResponse.log = Collections.emptyList();
                 return prepareResponse;
             }