hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r470022 - in /lucene/hadoop/trunk: CHANGES.txt src/contrib/build-contrib.xml src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java src/java/org/apache/hadoop/filecache/DistributedCache.java
Date Wed, 01 Nov 2006 18:28:37 GMT
Author: cutting
Date: Wed Nov  1 10:28:36 2006
New Revision: 470022

URL: http://svn.apache.org/viewvc?view=rev&rev=470022
Log:
HADOOP-663.  Fix a few unit test issues.  Contributed by Mahadev.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/build-contrib.xml
    lucene/hadoop/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/filecache/DistributedCache.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=470022&r1=470021&r2=470022
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Nov  1 10:28:36 2006
@@ -114,6 +114,8 @@
 31. HADOOP-660.  Permit specification of junit test output format.
     (Nigel Daley via cutting)
 
+32. HADOOP-663.  Fix a few unit test issues.  (Mahadev Konar via cutting)
+
 
 Release 0.7.2 - 2006-10-18
 

Modified: lucene/hadoop/trunk/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/build-contrib.xml?view=diff&rev=470022&r1=470021&r2=470022
==============================================================================
--- lucene/hadoop/trunk/src/contrib/build-contrib.xml (original)
+++ lucene/hadoop/trunk/src/contrib/build-contrib.xml Wed Nov  1 10:28:36 2006
@@ -20,7 +20,7 @@
   <available file="${src.test}" type="dir" property="test.available"/>
 
   <property name="conf.dir" location="${hadoop.root}/conf"/>
-
+  <property name="test.junit.output.format" value="plain"/>
   <property name="build.dir" location="${hadoop.root}/build/contrib/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.test" location="${build.dir}/test"/>

Modified: lucene/hadoop/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java?view=diff&rev=470022&r1=470021&r2=470022
==============================================================================
--- lucene/hadoop/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
(original)
+++ lucene/hadoop/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
Wed Nov  1 10:28:36 2006
@@ -64,7 +64,7 @@
         mr  = new MiniMRCluster(jobTrackerPort, 60060, 1, namenode, true, 3);
         // During tests, the default Configuration will use a local mapred
         // So don't specify -config or -cluster
-        String strJobtracker = "mapred.job.tracker=" + "localhost:" + jobTrackerPort;
+        String strJobtracker = "mapred.job.tracker=" + "localhost:" + mr.getJobTrackerPort();
         String strNamenode = "fs.default.name=" + namenode;
         String argv[] = new String[] {
             "-input", INPUT_FILE,

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/filecache/DistributedCache.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/filecache/DistributedCache.java?view=diff&rev=470022&r1=470021&r2=470022
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/filecache/DistributedCache.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/filecache/DistributedCache.java Wed Nov
 1 10:28:36 2006
@@ -125,7 +125,7 @@
         if (lcacheStatus.refcount == 0) {
           // delete this cache entry
           FileSystem.getNamed("local", conf).delete(lcacheStatus.localLoadPath);
-          cachedArchives.remove(cacheId);
+          it.remove();
         }
       }
     }



Mime
View raw message