Fix tests

hashicorp · Feb 7, 2022 · 2def944 · 2def944
1 parent 075904a
commit 2def944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 69 deletions.
diff --git a/internal/service/efs/mount_target_test.go b/internal/service/efs/mount_target_test.go
@@ -359,10 +359,10 @@ resource "aws_efs_file_system" "test" {
 
 resource "aws_efs_mount_target" "test" {
   file_system_id = aws_efs_file_system.test.id
-  ip_address     = %[1]q
+  ip_address     = %[2]q
   subnet_id      = aws_subnet.test.id
 }
-`, ipAddress)
+`, rName, ipAddress)
 }
 
 func testAccMountTargetIPAddressConfigNullIP(rName string) string {

diff --git a/internal/service/s3/bucket_object_test.go b/internal/service/s3/bucket_object_test.go
@@ -1312,45 +1312,6 @@ func TestAccS3BucketObject_ignoreTags(t *testing.T) {
 	})
 }
 
-func TestAccS3BucketObject_bucketObjectBucket(t *testing.T) {
-	var obj1 s3.GetObjectOutput
-	resourceName1 := "aws_s3_bucket_object.test"
-	resourceName2 := "aws_s3_object.test"
-	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { acctest.PreCheck(t) },
-		ErrorCheck:   acctest.ErrorCheck(t, s3.EndpointsID),
-		Providers:    acctest.Providers,
-		CheckDestroy: testAccCheckBucketObjectDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccBucketObjectConfig_objectBucketObject1(rName, "hink"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckBucketObjectExists(resourceName1, &obj1),
-					testAccCheckBucketObjectBody(&obj1, "hink"),
-				),
-			},
-			{
-				Config: testAccBucketObjectConfig_objectBucketObject2(rName, "hink"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckBucketObjectExists(resourceName2, &obj1),
-					testAccCheckBucketObjectBody(&obj1, "hink"),
-				),
-				PlanOnly:           true,
-				ExpectNonEmptyPlan: true,
-			},
-			{
-				Config: testAccBucketObjectConfig_objectBucketObject2(rName, "hink"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckObjectExists(resourceName2, &obj1),
-					testAccCheckObjectBody(&obj1, "hink"),
-				),
-			},
-		},
-	})
-}
-
 func testAccCheckBucketObjectVersionIdDiffers(first, second *s3.GetObjectOutput) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if first.VersionId == nil {
@@ -2188,31 +2149,3 @@ resource "aws_s3_bucket_object" "object" {
 }
 `, rName, content)
 }
-
-func testAccBucketObjectConfig_objectBucketObject1(rName string, content string) string {
-	return fmt.Sprintf(`
-resource "aws_s3_bucket" "test" {
-  bucket = %[1]q
-}
-
-resource "aws_s3_bucket_object" "test" {
-  bucket  = aws_s3_bucket.test.bucket
-  key     = %[1]q
-  content = %[2]q
-}
-`, rName, content)
-}
-
-func testAccBucketObjectConfig_objectBucketObject2(rName string, content string) string {
-	return fmt.Sprintf(`
-resource "aws_s3_bucket" "test" {
-  bucket = %[1]q
-}
-
-resource "aws_s3_object" "test" {
-  bucket  = aws_s3_bucket.test.bucket
-  key     = %[1]q
-  content = %[2]q
-}
-`, rName, content)
-}