From 9da4ce71a29ed084b7fdb00e7055df55c52feb53 Mon Sep 17 00:00:00 2001
From: abayer <abayer@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 13 Aug 2009 03:42:43 +0000
Subject: [PATCH] [FIXED HUDSON-4177] getResult() is null by default again - no
 actual live code depended on it being set, as it turned out. Also added
 integration test for this use case.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20654 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Run.java       |   8 +++++---
 .../test/java/hudson/maven/MavenBuildTest.java |  17 ++++++++++++++++-
 .../maven/maven-test-failure-findbugs.zip      | Bin 0 -> 1937 bytes
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100755 test/src/test/resources/hudson/maven/maven-test-failure-findbugs.zip

diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index d71111691b..7ca77ed0b7 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -1186,9 +1186,6 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      */
     protected void onStartBuilding() {
         state = State.BUILDING;
-        // start with the best possible value, and code that calls setResult() can progressively set
-        // worse results.
-        result = Result.SUCCESS;
         RunnerStack.INSTANCE.push(runner);
     }
 
@@ -1206,6 +1203,11 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         }
         runner = null;
         RunnerStack.INSTANCE.pop();
+	if (result==null) {
+	    result = Result.FAILURE;
+	    LOGGER.warning(toString()+": No build result is set, so marking as failure. This shouldn't happen.");
+        }
+
         RunListener.fireFinalized(this);
     }
 
diff --git a/test/src/test/java/hudson/maven/MavenBuildTest.java b/test/src/test/java/hudson/maven/MavenBuildTest.java
index 437f006f96..abc3fe9a76 100644
--- a/test/src/test/java/hudson/maven/MavenBuildTest.java
+++ b/test/src/test/java/hudson/maven/MavenBuildTest.java
@@ -5,6 +5,7 @@ import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import hudson.Launcher;
 import hudson.model.BuildListener;
+import hudson.model.Result;
 
 import java.io.IOException;
 
@@ -16,7 +17,7 @@ public class MavenBuildTest extends HudsonTestCase {
      * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}.
      */
     @Bug(4192)
-    public void testMavenRun() throws Exception {
+    public void testMavenWorkspaceExists() throws Exception {
         configureDefaultMaven();
         MavenModuleSet m = createMavenProject();
         m.getReporters().add(new TestReporter());
@@ -24,6 +25,20 @@ public class MavenBuildTest extends HudsonTestCase {
         assertBuildStatusSuccess(m.scheduleBuild2(0).get());
     }
 
+    /**
+     * {@link Result} getting set to SUCCESS even if there's a test failure, when the test failure
+     * does not happen in the final task segment.
+     */
+    @Bug(4177)
+    public void testTestFailureInEarlyTaskSegment() throws Exception {
+        configureDefaultMaven();
+        MavenModuleSet m = createMavenProject();
+	m.setGoals("clean install findbugs:findbugs");
+	//        m.getReporters().add(new TestReporter());
+        m.setScm(new ExtractResourceSCM(getClass().getResource("maven-test-failure-findbugs.zip")));
+        assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get());
+    }
+
     private static class TestReporter extends MavenReporter {
         @Override
         public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
diff --git a/test/src/test/resources/hudson/maven/maven-test-failure-findbugs.zip b/test/src/test/resources/hudson/maven/maven-test-failure-findbugs.zip
new file mode 100755
index 0000000000000000000000000000000000000000..d39dabd8f49720f87d30ed88d9fff8fcf5616641
GIT binary patch
literal 1937
zcmWIWW@Zs#U|`^2u<qfp=GemKxt)=LA%&HJfgLDXke{npk(={2<aFL`1A#riwOQtC
z2l*9o@VGhT>rS}B7{juYm1paumtHCd+t>c9{kcJg%dbJE=#A%{nGf~SJvuaWzaPjk
z<lAddetPcKtlp0f{0ai0Q{FOo-hFudEb~4`(N)ttcgpeFukJstY!&BzH#BtZhtG%q
zUdxxsIN7=}#2`Yi>(Kj%*&O%1-E^lv5`Ns(FCwVHZ?1pUyVdQoPPTm$&!)zIoLfHL
zeSM?hfuxwr+-ZJ)bF#RP3E6};F1+<=no+fyvBHPCKk~N<FJ7%)#aXA#Txro8v2fL$
zf4~0i_`C6^?*~O`ofixn3j@VIUJklv&3nIVTKBW7rOPr7=r2^X$U3aH{P(YB0S>+t
z0n-HzCJGYl!VNONW;dMqagWokT<+zWH=c&u<y|Mw&o1c>Gp?R!=A&iNI{n&9lZv`I
zYx>mrF06k1*Q9;Ly`KqZcjm8JZuI$4vcsACANs7C*>+AB-}mg?vL&a#Gz8uMKIdHC
zmsf{YE}to)`+iPe{!d>1D<)4XUznfMO3z*`D^SyUep_$)j-`7){`wf?{-L_~Z}J(T
zS*s?<9}M20n8NE-wfg1Bf9HR47k_gVdv_@K<@qT6e~baZxa9)IA_Id#DUUUn0VP;~
zba7F#K5iA9P!+j}nR$4W@gXbAN-RsnqgEJ0ZAofz30MOp1%h0ua8i`J1*mX25KCj%
z;8;+g2eL}HcO%~+0|Dpnzqu}Vre)YK5SFfHXFDQrNu$eSw#LpTfmi#BmqbikV{Lod
zb9Q@~SPnP8%ibWC*3G<%k3@@S@D+7ed%d=;U=}XXv{=gWOTguSed1Z6^DorT+|qaN
zne+G2I`bEAxNdR1pF00od7^cB;Zr@%<Bn2i_f@al&3kL%CF$HRtb_v)?nmq~0SiE|
zG9m*Ip%!j9Bml#JSvY5Rjk6dq3->TFFvvp#5KRLx07HNw4-UlIi3j}-8}PKfujG>7
z?X{)6O!C%TW^MinTk|+yPdec#A#`i^;~ly_$!FT#PW}J=UHtm%ZwuI4IuzGUHFAHi
zaj1HeTA1xi<#{r)tK6<wKMG^tlYK)~_~yb_n?eE(X<MhLed$vuc--;fN$u35&v?^)
zXB$3Q9rbgIyf63L70xG)&Ee$Q@xge}TP7WeSKjMV1J(&`Yq2VNB6K_L`V!q~z1MrR
zKN%-CpOwFU|INy$a~jj8FqKX0k*yOBdo(MesP)OjF78_0OOdgc^Ei@~v==+yn^jN{
z-C(PyykR%1@S?t&6M0Lv?pQWsv+leH&)18bR$i64`~Rf9GY+a2W!^Hiv0IbpSYvUS
zQ+fHnndg6cY+QIGxZ1X@+jh=X^8jx~CJ_eQ<svX#85kK9Kok%_OG$_(?9mL$a1bB>
zr0xLY2a^3j)?n8G%7736((w<f1DYLiYXhYx2monQ1ttQJMPO~v)P-9wD1$-(NN*s9
zUTA7V1P!(f3o-x_G)>qIfMs8N!G-F1duE6)knG1EW~iP|L)J#3=O<z4MY0@sW<z-X
cFm?lwvtEEVD;r1y7Z9cb!%7TT=`t_?0P?3!@Bjb+

literal 0
HcmV?d00001