Merge pull request jenkinsci#232 from janinko/master

Combine forks
AtkinsChang · Nov 23, 2015 · 520ca32 · 520ca32
2 parents d85a8f5 + 50a7132
commit 520ca32
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/manager/impl/GhprbBaseBuildManager.java b/src/main/java/org/jenkinsci/plugins/ghprb/manager/impl/GhprbBaseBuildManager.java
@@ -12,8 +12,8 @@
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Result;
+import hudson.tasks.test.AbstractTestResultAction;
 import hudson.tasks.junit.TestResult;
-import hudson.tasks.junit.TestResultAction;
 import hudson.tasks.junit.CaseResult;
 import hudson.tasks.test.AggregatedTestResultAction;
 import hudson.tasks.test.AggregatedTestResultAction.ChildReport;
@@ -172,7 +172,7 @@ protected String getAggregatedTestResults(AbstractBuild<?, ?> build) {
 
     public String getOneLineTestResults() {
 
-        TestResultAction testResultAction = build.getAction(TestResultAction.class);
+        AbstractTestResultAction testResultAction = build.getAction(AbstractTestResultAction.class);
 
         if (testResultAction == null) {
             return "No test results found.";