From 3421214f1ae30f5ae0b07247da68cfaa96cc3e44 Mon Sep 17 00:00:00 2001
From: Kit Ewbank <Kit_Ewbank@hotmail.com>
Date: Fri, 25 Sep 2020 14:38:54 -0400
Subject: [PATCH] r/aws_kinesisanalyticsv2_application: Remove
 'testAccCheckKinesisAnalyticsV2ApplicationDisappears' (#13527).

---
 ...aws_kinesisanalyticsv2_application_test.go | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/aws/resource_aws_kinesisanalyticsv2_application_test.go b/aws/resource_aws_kinesisanalyticsv2_application_test.go
index 43069bbf87d..8ccd5d73441 100644
--- a/aws/resource_aws_kinesisanalyticsv2_application_test.go
+++ b/aws/resource_aws_kinesisanalyticsv2_application_test.go
@@ -3,7 +3,6 @@ package aws
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/kinesisanalyticsv2"
@@ -54,7 +53,7 @@ func TestAccAWSKinesisAnalyticsV2Application_disappears(t *testing.T) {
 				Config: testAccKinesisAnalyticsV2Application_basic(rInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckKinesisAnalyticsV2ApplicationExists(resourceName, &application),
-					testAccCheckKinesisAnalyticsV2ApplicationDisappears(&application),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsKinesisAnalyticsV2Application(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -796,36 +795,6 @@ func testAccCheckKinesisAnalyticsV2ApplicationExists(n string, application *kine
 	}
 }
 
-func testAccCheckKinesisAnalyticsV2ApplicationDisappears(desc *kinesisanalyticsv2.ApplicationDetail) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-
-		conn := testAccProvider.Meta().(*AWSClient).kinesisanalyticsv2conn
-		describeOpts := &kinesisanalyticsv2.DescribeApplicationInput{
-			ApplicationName: desc.ApplicationName,
-		}
-		deleteInput := &kinesisanalyticsv2.DeleteApplicationInput{
-			ApplicationName: desc.ApplicationName,
-			CreateTimestamp: desc.CreateTimestamp,
-		}
-		_, err := conn.DeleteApplication(deleteInput)
-		if err != nil {
-			return err
-		}
-		err = resource.Retry(1*time.Minute, func() *resource.RetryError {
-			resp, err := conn.DescribeApplication(describeOpts)
-			if err == nil {
-				if resp.ApplicationDetail != nil && *resp.ApplicationDetail.ApplicationStatus == kinesisanalyticsv2.ApplicationStatusDeleting {
-					return resource.RetryableError(fmt.Errorf("Application still exists"))
-				}
-			}
-			return nil
-		})
-
-		return err
-	}
-
-}
-
 func testAccPreCheckAWSKinesisAnalyticsV2(t *testing.T) {
 	conn := testAccProvider.Meta().(*AWSClient).kinesisanalyticsv2conn