diff options
author | jonmv <venstad@gmail.com> | 2022-06-28 09:31:58 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-06-28 09:31:58 +0200 |
commit | 857e94c657d6fac858b13bf45092200112272fa5 (patch) | |
tree | 6a90786ff65fb47183f0102fa30f067c0f9d3a7d | |
parent | c2142b2fe5129b50f75a235eb1a4a92e31ddb8c5 (diff) |
Call duration duration, not end
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java | 4 | ||||
-rw-r--r-- | vespa-osgi-testrunner/src/test/resources/report.json | 48 |
2 files changed, 26 insertions, 26 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java index 4bf40323193..b1ca6c84b75 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java @@ -197,7 +197,7 @@ public class TestRunnerHandler extends ThreadedHttpRequestHandler { nodeObject.setString("name", node.name()); nodeObject.setString("status", node.status().name()); nodeObject.setLong("start", node.start().toEpochMilli()); - nodeObject.setLong("end", node.duration().toMillis()); + nodeObject.setLong("duration", node.duration().toMillis()); } static void toSlime(Cursor nodeObject, TestNode node) { @@ -205,7 +205,7 @@ public class TestRunnerHandler extends ThreadedHttpRequestHandler { nodeObject.setString("name", node.name()); nodeObject.setString("status", node.status().name()); nodeObject.setLong("start", node.start().toEpochMilli()); - nodeObject.setLong("end", node.duration().toMillis()); + nodeObject.setLong("duration", node.duration().toMillis()); } static void toSlime(Cursor nodeObject, OutputNode node) { diff --git a/vespa-osgi-testrunner/src/test/resources/report.json b/vespa-osgi-testrunner/src/test/resources/report.json index 69b11b40ed9..9c41a83a6b5 100644 --- a/vespa-osgi-testrunner/src/test/resources/report.json +++ b/vespa-osgi-testrunner/src/test/resources/report.json @@ -4,28 +4,28 @@ "name": "Production test", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "container", "name": "JUnit Jupiter", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "container", "name": "SampleTest", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "test", "name": "aborted()", "status": "aborted", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -44,7 +44,7 @@ "name": "error()", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -68,7 +68,7 @@ "name": "failing()", "status": "failed", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -97,14 +97,14 @@ "name": "ignored()", "status": "skipped", "start": 0, - "end": 0 + "duration": 0 }, { "type": "test", "name": "inconclusive(TestReporter)", "status": "inconclusive", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -133,7 +133,7 @@ "name": "successful()", "status": "successful", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -168,14 +168,14 @@ "name": "Inner", "status": "failed", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "container", "name": "others()", "status": "failed", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -192,7 +192,7 @@ "name": "second", "status": "successful", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -211,7 +211,7 @@ "name": "third", "status": "failed", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "failure", @@ -227,7 +227,7 @@ "name": "first()", "status": "successful", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "output", @@ -248,14 +248,14 @@ "name": "Skipped", "status": "skipped", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "test", "name": "disabled()", "status": "skipped", "start": 0, - "end": 0 + "duration": 0 } ] } @@ -268,21 +268,21 @@ "name": "JUnit Jupiter", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "container", "name": "FailingTestAndBothAftersTest", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "test", "name": "test()", "status": "failed", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "failure", @@ -303,7 +303,7 @@ "name": "WrongBeforeAllTest", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "failure", @@ -315,14 +315,14 @@ "name": "fest()", "status": "skipped", "start": 0, - "end": 0 + "duration": 0 }, { "type": "test", "name": "test()", "status": "skipped", "start": 0, - "end": 0 + "duration": 0 } ] }, @@ -331,14 +331,14 @@ "name": "FailingExtensionTest", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "test", "name": "test()", "status": "error", "start": 0, - "end": 0, + "duration": 0, "children": [ { "type": "failure", |