Skip to content

Commit a39b176

Browse files
authored
Pluggable storage: Add stdout, stderr, stacktrace, fix caseresult loading (#170)
1 parent 77a19c8 commit a39b176

File tree

3 files changed

+69
-34
lines changed

3 files changed

+69
-34
lines changed

src/main/java/hudson/tasks/junit/CaseResult.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,24 @@ public CaseResult(SuiteResult parent, String testName, String errorStackTrace, S
134134
}
135135

136136
@Restricted(Beta.class)
137-
public CaseResult(SuiteResult parent, String className, String testName, String errorDetails, String skippedMessage, float duration) {
137+
public CaseResult(
138+
SuiteResult parent,
139+
String className,
140+
String testName,
141+
String errorDetails,
142+
String skippedMessage,
143+
float duration,
144+
String stdout,
145+
String stderr,
146+
String stacktrace
147+
) {
138148
this.className = className;
139149
this.testName = testName;
140-
this.errorStackTrace = null;
150+
this.errorStackTrace = stacktrace;
141151
this.errorDetails = errorDetails;
142152
this.parent = parent;
143-
this.stdout = null;
144-
this.stderr = null;
153+
this.stdout = stdout;
154+
this.stderr = stderr;
145155
this.duration = duration;
146156

147157
this.skipped = skippedMessage != null;

src/main/java/hudson/tasks/junit/PackageResult.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@
2424
package hudson.tasks.junit;
2525

2626
import hudson.model.Run;
27-
import io.jenkins.plugins.junit.storage.FileJunitTestResultStorage;
2827
import io.jenkins.plugins.junit.storage.TestResultImpl;
29-
import io.jenkins.plugins.junit.storage.JunitTestResultStorage;
3028
import hudson.tasks.test.MetaTabulatedResult;
3129
import hudson.tasks.test.TestResult;
32-
import org.kohsuke.stapler.Stapler;
3330
import org.kohsuke.stapler.StaplerRequest;
3431
import org.kohsuke.stapler.StaplerResponse;
3532
import org.kohsuke.stapler.export.Exported;
@@ -148,15 +145,7 @@ public int getSkipCount() {
148145

149146
@Override
150147
public Object getDynamic(String name, StaplerRequest req, StaplerResponse rsp) {
151-
JunitTestResultStorage storage = JunitTestResultStorage.find();
152-
ClassResult result;
153-
if (!(storage instanceof FileJunitTestResultStorage)) {
154-
Run<?, ?> run = Stapler.getCurrentRequest().findAncestorObject(Run.class);
155-
TestResultImpl pluggableStorage = storage.load(run.getParent().getFullName(), run.getNumber());
156-
result = pluggableStorage.getClassResult(name);
157-
} else {
158-
result = getClassResult(name);
159-
}
148+
ClassResult result = getClassResult(name);
160149
if (result != null) {
161150
return result;
162151
} else {

0 commit comments

Comments
 (0)