[FIXED JENKINS-21977] Skip HsErrPidList when running functional tests.

jenkinsci · Aug 27, 2014 · f39c435 · f39c435
1 parent 1d35688
commit f39c435
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -61,6 +61,9 @@
   <li class=bug>
     Job status page shows "Build has been executing for null on master" for flyweight tasks.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20307">issue 20307</a>)
+  <li class=bug>
+    File locking issue when running functional tests on Windows.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21977">issue 21977</a>)
   <li class=bug>
     Tolerate ?auto_refresh in reverse proxy check on /manage page.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-24014">issue 24014</a>)

diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
@@ -30,7 +30,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-@Extension(optional=true)
+@Extension(optional=true) // TODO why would an extension using a built-in extension point need to be marked optional?
 public class HsErrPidList extends AdministrativeMonitor {
     /**
      * hs_err_pid files that we think belong to us.
@@ -43,6 +43,9 @@ public class HsErrPidList extends AdministrativeMonitor {
     private MappedByteBuffer map;
 
     public HsErrPidList() {
+        if (Functions.getIsUnitTest()) {
+            return;
+        }
         try {
             FileChannel ch = new FileInputStream(getSecretKeyFile()).getChannel();
             map = ch.map(MapMode.READ_ONLY,0,1);