MAPREDUCE-1993. Fixes test failure TestTrackerDistributedCacheManagerWithLinuxTaskController. Contributed by Devaraj Das

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@982242 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index a913556..4a9cd21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -108,6 +108,10 @@
     MAPREDUCE-1834. TestSimulatorDeterministicReplay timesout on trunk.
     (Hong Tang via mahadev)
 
+    MAPREDUCE-1993. Fixes test failure
+    TestTrackerDistributedCacheManagerWithLinuxTaskController. (Devaraj Das
+    via amareshwari)
+
   OPTIMIZATIONS
 
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and
diff --git a/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java b/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
index 3423a56..1686660 100644
--- a/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
+++ b/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
@@ -307,6 +307,9 @@
   
   public void testPrivateCacheForMultipleUsers() 
   throws IOException, LoginException, InterruptedException{
+    if (!canRun()) {
+      return;
+    }
     // Try to initialize the distributed cache for the same file on the
     // HDFS, for two different users.
     // First initialize as the user running the test, then as some other user.