Ignore all content-type checks in functional tests (minio#688)

PR addresses all situations to avoid consistency issues with AWS S3.
skylarkai · Jul 5, 2018 · 6e2741d · 6e2741d
1 parent fc80c70
commit 6e2741d
Showing 1 changed file with 3 additions and 30 deletions.
diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java
@@ -51,7 +51,6 @@ public class FunctionalTest {
   private static final int MB = 1024 * 1024;
   private static final Random random = new Random(new SecureRandom().nextLong());
   private static final String customContentType = "application/javascript";
-  private static final String defaultType = "application/octet-stream";
   private static final String nullContentType = null;
   private static String bucketName = getRandomName();
   private static boolean mintEnv = false;
@@ -464,11 +463,6 @@ public static void putObject_test3() throws Exception {
       String filename = createFile1Mb();
       client.putObject(bucketName, filename, filename, customContentType);
       Files.delete(Paths.get(filename));
-      ObjectStat objectStat = client.statObject(bucketName, filename);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
       client.removeObject(bucketName, filename);
       mintSuccessLog("putObject(String bucketName, String objectName, String filename, String contentType)",
                      "contentType: " + customContentType, startTime);
@@ -495,13 +489,8 @@ public static void putObject_test4() throws Exception {
       try (final InputStream is = new ContentInputStream(1 * MB)) {
         client.putObject(bucketName, objectName, is, 1 * MB, customContentType);
       }
-      ObjectStat objectStat = client.statObject(bucketName, objectName);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
-      client.removeObject(bucketName, objectName);
 
+      client.removeObject(bucketName, objectName);
       mintSuccessLog("putObject(String bucketName, String objectName, InputStream body, long size,"
                      + " String contentType)",
                      "size: 1 MB, objectName: " + customContentType, startTime);
@@ -594,11 +583,7 @@ public static void testPutObjectUnknownStreamSize(long size) throws Exception {
       try (final InputStream is = new ContentInputStream(size)) {
         client.putObject(bucketName, objectName, is, customContentType);
       }
-      ObjectStat objectStat = client.statObject(bucketName, objectName);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
+
       client.removeObject(bucketName, objectName);
 
       mintSuccessLog("putObject(String bucketName, String objectName, InputStream body, String contentType)",
@@ -712,11 +697,6 @@ public static void putObject_test11() throws Exception {
         client.putObject(bucketName, objectName, is, 13 * MB, headerMap);
       }
 
-      ObjectStat objectStat = client.statObject(bucketName, objectName);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
       client.removeObject(bucketName, objectName);
 
       mintSuccessLog("putObject(String bucketName, String objectName, InputStream stream, "
@@ -753,10 +733,6 @@ public static void putObject_test12() throws Exception {
       }
 
       ObjectStat objectStat = client.statObject(bucketName, objectName);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
       Map<String, List<String>> returnHeader = objectStat.httpHeaders();
       List<String> returnStorageClass = returnHeader.get("X-Amz-Storage-Class");
 
@@ -802,10 +778,7 @@ public static void putObject_test13() throws Exception {
       }
 
       ObjectStat objectStat = client.statObject(bucketName, objectName);
-      if ((!customContentType.equals(objectStat.contentType())) && (!defaultType.equals(objectStat.contentType()))) {
-        throw new Exception("content type mismatch, expected: " + customContentType + ", got: "
-                            + objectStat.contentType());
-      }
+
       Map<String, List<String>> returnHeader = objectStat.httpHeaders();
       List<String> returnStorageClass = returnHeader.get("X-Amz-Storage-Class");