hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1429200 - in /hadoop/common/branches/branch-1-win: ./ CHANGES.branch-1-win.txt CHANGES.txt src/mapred/ src/test/org/apache/hadoop/fs/TestFileSystem.java
Date Sat, 05 Jan 2013 04:29:16 GMT
Author: suresh
Date: Sat Jan  5 04:29:16 2013
New Revision: 1429200

URL: http://svn.apache.org/viewvc?rev=1429200&view=rev
Log:
HADOOP-9179. Merge change 1429199 from branch-1

Modified:
    hadoop/common/branches/branch-1-win/   (props changed)
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    hadoop/common/branches/branch-1-win/CHANGES.txt   (props changed)
    hadoop/common/branches/branch-1-win/src/mapred/   (props changed)
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/TestFileSystem.java

Propchange: hadoop/common/branches/branch-1-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1:r1429199

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1429200&r1=1429199&r2=1429200&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Sat Jan  5 04:29:16 2013
@@ -323,3 +323,5 @@ Branch-hadoop-1-win (branched from branc
     (Brandon Li via suresh)
 
     HDFS-4358. TestCheckpoint failure with JDK7. (Arpit Agarwal via suresh)
+
+    HADOOP-9179. TestFileSystem fails with open JDK7. (Brandon Li via suresh)

Propchange: hadoop/common/branches/branch-1-win/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1429199

Propchange: hadoop/common/branches/branch-1-win/src/mapred/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/src/mapred:r1429199

Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/TestFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/TestFileSystem.java?rev=1429200&r1=1429199&r2=1429200&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/TestFileSystem.java
(original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/TestFileSystem.java
Sat Jan  5 04:29:16 2013
@@ -19,6 +19,12 @@
 package org.apache.hadoop.fs;
 
 import static org.mockito.Mockito.mock;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -35,8 +41,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
@@ -65,9 +69,10 @@ import org.apache.hadoop.security.UserGr
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.util.Progressable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestFileSystem extends TestCase {
+public class TestFileSystem {
   private static final Log LOG = FileSystem.LOG;
 
   private static Configuration conf = new Configuration();
@@ -82,6 +87,11 @@ public class TestFileSystem extends Test
   private static Path READ_DIR = new Path(ROOT, "fs_read");
   private static Path DATA_DIR = new Path(ROOT, "fs_data");
 
+  @BeforeClass
+  public static void initialize() throws Exception {
+    NetUtilsTestResolver.install();
+  }
+
   public void testFs() throws Exception {
     testFs(10 * MEGA, 100, 0);
   }



Mime
View raw message