merge -r 1374083:1374084 from trunk. FIXES: HADOOP-8390

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374085 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-08-16 22:19:23 +00:00
parent 841dda010b
commit 4923791df8
2 changed files with 10 additions and 5 deletions

View File

@ -733,6 +733,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave
Thompson via bobby)
HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor
Robinson via tgraves)
Release 0.23.2 - UNRELEASED
NEW FEATURES

View File

@ -18,18 +18,20 @@
package org.apache.hadoop.fs;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.net.URI;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.security.NetUtilsTestResolver;
import org.apache.hadoop.util.Progressable;
import org.junit.BeforeClass;
import org.junit.Test;
public class TestFileSystemCanonicalization extends TestCase {
public class TestFileSystemCanonicalization {
static String[] authorities = {
"myfs://host",
"myfs://host.a",
@ -41,8 +43,8 @@ public class TestFileSystemCanonicalization extends TestCase {
};
@Test
public void testSetupResolver() throws Exception {
@BeforeClass
public static void initialize() throws Exception {
NetUtilsTestResolver.install();
}