Enable bucket deletion for integration tests.

This does not completely fix all leaks, but should allow bucket cleanup to function properly. Change on 2017/04/14 by angusdavis <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=153225400
GoogleCloudDataproc · Apr 21, 2017 · d2d1f6c · d2d1f6c
1 parent 7ddca40
commit d2d1f6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/gcs/src/test/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystemTestBase.java b/gcs/src/test/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystemTestBase.java
@@ -84,6 +84,9 @@ protected static Configuration loadConfig(
         GoogleHadoopFileSystemBase.GCS_ENABLE_REPAIR_IMPLICIT_DIRECTORIES_KEY, true);
     config.setBoolean(
         GoogleHadoopFileSystemBase.GCS_ENABLE_INFER_IMPLICIT_DIRECTORIES_KEY, false);
+    // Allow buckets to be deleted in test cleanup:
+    config.setBoolean(
+        GoogleHadoopFileSystemBase.GCE_BUCKET_DELETE_ENABLE_KEY, true);
     return config;
   }
 

diff --git a/.../test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java b/.../test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java
@@ -121,6 +121,7 @@ public static void beforeAllTests()
 
       optionsBuilder
           .setIsMetadataCacheEnabled(true)
+          .setEnableBucketDelete(true)
           .setShouldIncludeInTimestampUpdatesPredicate(INCLUDE_SUBSTRINGS_PREDICATE)
           .getCloudStorageOptionsBuilder()
           .setAppName(appName)