Merge pull request aol#300 from aol/s3-aes256-encryption-support

johnmcclean · web-flow · commit 0c705bdaf447 · 2017-02-01T13:07:36.000Z
S3 aes256 encryption support
diff --git a/micro-s3/src/test/java/com/aol/micro/server/s3/data/S3DownloadSystemTest.java b/micro-s3/src/test/java/com/aol/micro/server/s3/data/S3DownloadSystemTest.java
@@ -14,22 +14,20 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.io.FileUtils;
 import org.coursera.metrics.datadog.DatadogReporter;
 import org.coursera.metrics.datadog.transport.HttpTransport;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.transfer.TransferManager;
 import com.amazonaws.services.s3.transfer.model.UploadResult;
-import com.aol.cyclops.control.FluentFunctions;
 import com.aol.cyclops.control.Try;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
@@ -90,11 +88,12 @@ public static void setupMetrics() {
         DatadogReporter reporter = builder.build();
         int reportPeriod = 5;
         TimeUnit reportUnit = TimeUnit.valueOf("SECONDS");
-        log.info("Reporting to datadog every {} {}", 5, reportUnit);
+        log.info("Reporting to datadog every {} {}", reportPeriod, reportUnit);
         reporter.start(reportPeriod, reportUnit);
     }
   
     @Test
+    @Ignore
     public void download(){
         S3ObjectWriter writerWithEncryption = buildWriterWithEncryption(true);
         String name = "uploadWithEncryption" + r.nextLong();
