From 343f1716906a88a1a2156769e8dea5a999b3a35b Mon Sep 17 00:00:00 2001 From: Megan Bang Date: Fri, 19 Nov 2021 12:08:25 -0600 Subject: [PATCH 1/2] update expected error message for google project service disable dependent services test --- .../terraform/tests/resource_google_project_service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/tests/resource_google_project_service_test.go b/mmv1/third_party/terraform/tests/resource_google_project_service_test.go index 3789ae154e9a..9ce39c13e39b 100644 --- a/mmv1/third_party/terraform/tests/resource_google_project_service_test.go +++ b/mmv1/third_party/terraform/tests/resource_google_project_service_test.go @@ -142,7 +142,7 @@ func TestAccProjectService_disableDependentServices(t *testing.T) { }, { Config: testAccProjectService_dependencyRemoved(services, pid, pname, org, billingId), - ExpectError: regexp.MustCompile("service .* not in enabled services for project"), + ExpectError: regexp.MustCompile("plan was not empty"), }, }, }) From 32ba4b23d18321fbb86752fe0a962d4f885556d8 Mon Sep 17 00:00:00 2001 From: Megan Bang Date: Mon, 22 Nov 2021 11:11:22 -0600 Subject: [PATCH 2/2] use ExpectNonEmptyPlan instead --- .../terraform/tests/resource_google_project_service_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/tests/resource_google_project_service_test.go b/mmv1/third_party/terraform/tests/resource_google_project_service_test.go index 9ce39c13e39b..f3436582edb6 100644 --- a/mmv1/third_party/terraform/tests/resource_google_project_service_test.go +++ b/mmv1/third_party/terraform/tests/resource_google_project_service_test.go @@ -141,8 +141,8 @@ func TestAccProjectService_disableDependentServices(t *testing.T) { ImportStateVerifyIgnore: []string{"disable_on_destroy"}, }, { - Config: testAccProjectService_dependencyRemoved(services, pid, pname, org, billingId), - ExpectError: regexp.MustCompile("plan was not empty"), + Config: testAccProjectService_dependencyRemoved(services, pid, pname, org, billingId), + ExpectNonEmptyPlan: true, }, }, })