[FIXED JENKINS-19307] Noting merge of pull #937.

jenkinsci · Oct 3, 2013 · 1c68183 · 1c68183
1 parent b86d9e9
commit 1c68183
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelog.html b/changelog.html
@@ -61,7 +61,10 @@
   <li class=bug>
     Windows JDK installer should not install a public JRE.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8957">issue 8957</a>)
-    <li class=bug>
+  <li class=bug>
+    SCM polling sometimes broken since 1.527 due to a change in how environment variables are calculated.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19307">issue 19307</a>)
+  <li class=bug>
     Breadcrumb bar moves away from header when scrolling past end of page on OS X.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19803">issue 19803</a>)
 </ul>

diff --git a/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java b/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java
@@ -1,9 +1,7 @@
 package jenkins.model;
 
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.spy;
 import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 import hudson.EnvVars;
 import hudson.model.Computer;
@@ -16,6 +14,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.Bug;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.powermock.api.mockito.PowerMockito;
@@ -41,6 +40,7 @@ public void setUp() throws Exception {
         instance = new CoreEnvironmentContributor();
     }
 
+    @Bug(19307)
     @Test
     @PrepareForTest(fullyQualifiedNames={"hudson.model.Computer", "jenkins.model.Jenkins"})
     public void buildEnvironmentForJobShouldntUseCurrentComputer() throws IOException, InterruptedException {