Integration test buckets deletion failed as it had attached access points (#2596)

joviegas · John Viegas · web-flow · commit af72d856d27b · 2021-07-15T14:19:33.000-07:00
Co-authored-by: John Viegas &lt;joviegas@gmail.com&gt;
diff --git a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java
@@ -76,8 +76,8 @@ public static void setupFixture() {
 
     @AfterClass
     public static void tearDown() {
-        deleteBucketAndAllContents(BUCKET);
         s3control.deleteAccessPoint(b -> b.accountId(accountId).name(AP_NAME));
+        deleteBucketAndAllContents(BUCKET);
     }
 
     @Test
diff --git a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AsyncAccessPointsIntegrationTest.java b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AsyncAccessPointsIntegrationTest.java
@@ -65,8 +65,8 @@ public static void setupFixture() {
 
     @AfterClass
     public static void tearDown() {
-        deleteBucketAndAllContents(BUCKET);
         s3control.deleteAccessPoint(b -> b.accountId(accountId).name(AP_NAME)).join();
+        deleteBucketAndAllContents(BUCKET);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ public static void setupFixture() {`
`76`	`76`
`77`	`77`	`@AfterClass`
`78`	`78`	`public static void tearDown() {`
`79`		`- deleteBucketAndAllContents(BUCKET);`
`80`	`79`	`s3control.deleteAccessPoint(b -> b.accountId(accountId).name(AP_NAME));`
	`80`	`+ deleteBucketAndAllContents(BUCKET);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ public static void setupFixture() {`
`65`	`65`
`66`	`66`	`@AfterClass`
`67`	`67`	`public static void tearDown() {`
`68`		`- deleteBucketAndAllContents(BUCKET);`
`69`	`68`	`s3control.deleteAccessPoint(b -> b.accountId(accountId).name(AP_NAME)).join();`
	`69`	`+ deleteBucketAndAllContents(BUCKET);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Test`