diff options
author | jonmv <venstad@gmail.com> | 2022-06-07 08:47:31 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-06-07 08:47:31 +0200 |
commit | 73b0c209efb5e607514f42a082f7b8346c33ebf8 (patch) | |
tree | 31353c79d4a6cf3eab5593c4144997eb19faee56 /vespa-osgi-testrunner | |
parent | 208dfbd3cd01a33276b56c4d5113a2402e9aee02 (diff) |
Correct check for beforeness, complete merged reports
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java index e28c0e0a141..016b5588e1c 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java @@ -151,13 +151,15 @@ public class TestReport { if (current != null || other.current != null) throw new IllegalArgumentException("can only merge completed test reports"); - if (root.start().isBefore(other.root.start())) + if (root.start().isAfter(other.root.start())) throw new IllegalArgumentException("appended test report cannot have started before the one appended to"); ContainerNode newRoot = new ContainerNode(null, root.name(), root.start()); newRoot.children.addAll(root.children); newRoot.children.addAll(other.root.children); - return new TestReport(clock, suite, newRoot); + TestReport merged = new TestReport(clock, suite, newRoot); + merged.complete(); + return merged; } } } |