Update expected test result

2 files changed, 12 insertions, 11 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 2e964f5b91a..a2a0ed64abb 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
@@ -328,28 +328,29 @@ public class InternalStepRunner implements StepRunner {
    7    LoggingInputStream:
 
    6    TestRunner:
-            List<LogRecord> getLogs(long after); // use LogRecord id
+            Map<Step, List<LogRecord>> getLogs(long after); // use LogRecord id
 
    4    LogBuffer:
-            List<LogRecord> get();
+            Map<Step, List<LogRecord>> logs();
             long last();
-            void add(Iterable<LogRecord> records); // assign natural numbers here
+            void add(Step step, LogRecord record); // reassign sequence ids here
             void clear();
 
    2    LogRecordSerializer:
 
    1    Run:
-            int lastTestRecord();
+            long lastTestRecord();
             Run with(long lastTestRecord);
 
    3    LogStore:
             (List<ObjectMeta> meta();)
-            List<LogRecord> get(long after);
-            void add(List<LogRecord> records, long last);
+            Map<Step, List<LogRecord>> logs(long after);
+            void store(Map<Step, List<LogRecord>> records);
 
    5    JobController:
-            List<LogRecord> logs(long after);
-            log(RunId id, Step step, List<LogRecord> log[, long lastTestRecord]);
+            Map<Step, List<LogRecord>> logs(long after);
+            log(RunId id, Step step, LogRecord record);
+            logTestRecords(RunId id, List<LogRecord> records, long lastId);
 
          */
 
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 d9198bc216c..334a875b948 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
@@ -311,7 +311,7 @@ public class InternalStepRunnerTest {
         cloud.set("Failure!".getBytes(), TesterCloud.Status.FAILURE);
         runner.run();
         assertEquals(failed, jobs.run(id).get().steps().get(Step.endTests));
-        assertLogMessages(id, Step.endTests, "Tests still running ...", "Tests failed.", "Failure!");
+        assertLogMessages(id, Step.endTests, "Tests failed.", "Failure!");
     }
 
     @Test
@@ -320,7 +320,7 @@ public class InternalStepRunnerTest {
         cloud.set("Error!".getBytes(), TesterCloud.Status.ERROR);
         runner.run();
         assertEquals(failed, jobs.run(id).get().steps().get(Step.endTests));
-        assertLogMessages(id, Step.endTests, "Tests still running ...", "Tester failed running its tests!", "Error!");
+        assertLogMessages(id, Step.endTests, "Tester failed running its tests!", "Error!");
     }
 
     @Test
@@ -342,7 +342,7 @@ public class InternalStepRunnerTest {
         cloud.set("Success!".getBytes(), TesterCloud.Status.SUCCESS);
         runner.run();
         assertEquals(succeeded, jobs.run(id).get().steps().get(Step.endTests));
-        assertLogMessages(id, Step.endTests, "Tests still running ...", "Tests still running ...", "Tests completed successfully.", "Success!");
+        assertLogMessages(id, Step.endTests, "Tests completed successfully.", "Success!");
     }
 
     private void assertLogMessages(RunId id, Step step, String... messages) {