From 00d5e38759d08fa89ef366fd430e900f4138f0af Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 1 May 2013 19:10:30 -0400 Subject: [PATCH] [JENKINS-17681] Set up a test which passes on Unix but fails on Windows when symlinks are enabled on the platform but disabled for the current user. --- .../java/jenkins/model/PeepholePermalink.java | 43 +++++++++++------- .../jenkins/model/PeepholePermalinkTest.java | 45 +++++++++++++++++++ 2 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 core/src/test/java/jenkins/model/PeepholePermalinkTest.java diff --git a/core/src/main/java/jenkins/model/PeepholePermalink.java b/core/src/main/java/jenkins/model/PeepholePermalink.java index aedd8325b5..2e4677a134 100644 --- a/core/src/main/java/jenkins/model/PeepholePermalink.java +++ b/core/src/main/java/jenkins/model/PeepholePermalink.java @@ -81,12 +81,7 @@ public abstract class PeepholePermalink extends Permalink implements Predicate b=null; try { - String target = Util.resolveSymlink(f); - if (target==null && f.exists()) { - // if this file isn't a symlink, it must be a regular file - target = FileUtils.readFileToString(f,"UTF-8").trim(); - } - + String target = readSymlink(f); if (target!=null) { int n = Integer.parseInt(Util.getFileName(target)); if (n==RESOLVES_TO_NONE) return null; @@ -135,19 +130,39 @@ public abstract class PeepholePermalink extends Permalink implements Predicate