Skip to content

Commit 4be21e7

Browse files
authored
tests/provider: Support (helper/schema.Resource).DeleteWithoutTimeout in testAccCheckResourceDisappears (#18398)
Reference: #15090 Output from acceptance testing: ``` # Existing Delete --- PASS: TestAccAWSXrayGroup_disappears (15.90s) # Existing DeleteContext --- PASS: TestAccAWSAMPWorkspace_disappears (13.63s) ```
1 parent 42e6039 commit 4be21e7

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

aws/provider_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -1018,8 +1018,14 @@ func testAccCheckResourceDisappears(provider *schema.Provider, resource *schema.
10181018
return fmt.Errorf("resource ID missing: %s", resourceName)
10191019
}
10201020

1021-
if resource.DeleteContext != nil {
1022-
diags := resource.DeleteContext(context.Background(), resource.Data(resourceState.Primary), provider.Meta())
1021+
if resource.DeleteContext != nil || resource.DeleteWithoutTimeout != nil {
1022+
var diags diag.Diagnostics
1023+
1024+
if resource.DeleteContext != nil {
1025+
diags = resource.DeleteContext(context.Background(), resource.Data(resourceState.Primary), provider.Meta())
1026+
} else {
1027+
diags = resource.DeleteWithoutTimeout(context.Background(), resource.Data(resourceState.Primary), provider.Meta())
1028+
}
10231029

10241030
for i := range diags {
10251031
if diags[i].Severity == diag.Error {

0 commit comments

Comments
 (0)