Browse Source

HADOOP-12801. Suppress obsolete S3FileSystem tests. Contributed by Chris Nauroth.

Chris Nauroth 9 years ago
parent
commit
27242f211e

+ 15 - 0
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java

@@ -22,6 +22,9 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractRootDirectoryTest;
 import org.apache.hadoop.fs.contract.AbstractContractRootDirectoryTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 
 
+import org.junit.Ignore;
+import org.junit.Test;
+
 /**
 /**
  * root dir operations against an S3 bucket
  * root dir operations against an S3 bucket
  */
  */
@@ -31,4 +34,16 @@ public class TestS3ContractRootDir extends AbstractContractRootDirectoryTest {
   protected AbstractFSContract createContract(Configuration conf) {
   protected AbstractFSContract createContract(Configuration conf) {
     return new S3Contract(conf);
     return new S3Contract(conf);
   }
   }
+
+  @Override
+  @Test
+  @Ignore
+  public void testRmEmptyRootDirNonRecursive() {
+  }
+
+  @Override
+  @Test
+  @Ignore
+  public void testRmRootRecursive() {
+  }
 }
 }

+ 9 - 0
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java

@@ -23,10 +23,19 @@ import org.apache.hadoop.fs.contract.AbstractContractSeekTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 
 
+import org.junit.Ignore;
+import org.junit.Test;
+
 public class TestS3ContractSeek extends AbstractContractSeekTest {
 public class TestS3ContractSeek extends AbstractContractSeekTest {
 
 
   @Override
   @Override
   protected AbstractFSContract createContract(Configuration conf) {
   protected AbstractFSContract createContract(Configuration conf) {
     return new S3Contract(conf);
     return new S3Contract(conf);
   }
   }
+
+  @Override
+  @Test
+  @Ignore
+  public void testReadFullyZeroByteFile() {
+  }
 }
 }

+ 3 - 0
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java

@@ -28,6 +28,7 @@ import java.io.File;
 import java.net.URI;
 import java.net.URI;
 
 
 import org.junit.Before;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TemporaryFolder;
@@ -120,6 +121,7 @@ public class TestS3Credentials {
   }
   }
 
 
   @Test(expected=IllegalArgumentException.class)
   @Test(expected=IllegalArgumentException.class)
+  @Ignore
   public void noSecretShouldThrow() throws Exception {
   public void noSecretShouldThrow() throws Exception {
     S3Credentials s3Credentials = new S3Credentials();
     S3Credentials s3Credentials = new S3Credentials();
     Configuration conf = new Configuration();
     Configuration conf = new Configuration();
@@ -128,6 +130,7 @@ public class TestS3Credentials {
   }
   }
 
 
   @Test(expected=IllegalArgumentException.class)
   @Test(expected=IllegalArgumentException.class)
+  @Ignore
   public void noAccessIdShouldThrow() throws Exception {
   public void noAccessIdShouldThrow() throws Exception {
     S3Credentials s3Credentials = new S3Credentials();
     S3Credentials s3Credentials = new S3Credentials();
     Configuration conf = new Configuration();
     Configuration conf = new Configuration();