Skip to content
Permalink
Browse files

Merge pr #6, upgrading tap4j to 4.2.0 and resolving conflicts

  • Loading branch information...
kinow committed May 18, 2016
2 parents 4646fba + 1d964ea commit 8e30c2df188b86baab249f9d51ae7743082fbef2
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.tap4j</groupId>
<artifactId>tap4j</artifactId>
<version>4.1.2</version>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
@@ -262,7 +262,7 @@ public float getDuration() {
Object duration = diagnostic.get(DURATION_KEY);
if (duration != null) {
Float durationMS = Float.parseFloat(duration.toString());
return durationMS.floatValue();
return durationMS.floatValue() / 1000;
}
}
return super.getDuration();
@@ -25,7 +25,7 @@ public void testDurationMs() throws IOException, InterruptedException, Execution
"ok 1 - Input file opened\n" +
"not ok 2 - First line of the input valid\n" +
" ---\n" +
" duration_ms: 100.66\n" +
" duration_ms: 100660.00\n" +
" ...\n";

project.getBuildersList().add(new TestBuilder() {

0 comments on commit 8e30c2d

Please sign in to comment.
You can’t perform that action at this time.