From c9f0fb1403ba5d302f2fc2eca72254dfcfbc77f4 Mon Sep 17 00:00:00 2001 From: Andrew Garner Date: Mon, 24 Jul 2023 18:16:05 -0500 Subject: [PATCH] AwaitServiceDeletion handles cf cli v8 output "cf service non-existent-instance" quotes the instance name in v8, but did not in the v6 cli. This change requires system tests are run with the cf v8 cli. [#184260867](https://www.pivotaltracker.com/story/show/184260867) Co-authored-by: Andrew Garner Co-authored-by: Kim Bassett --- system_tests/test_helpers/cf_helpers/service.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system_tests/test_helpers/cf_helpers/service.go b/system_tests/test_helpers/cf_helpers/service.go index 1386b60e4..97e67c44d 100644 --- a/system_tests/test_helpers/cf_helpers/service.go +++ b/system_tests/test_helpers/cf_helpers/service.go @@ -122,7 +122,7 @@ func AwaitServiceCreationWithTimeout(serviceName string, timeout time.Duration) func AwaitServiceDeletion(serviceName string) { awaitServiceOperation(cfService(serviceName), - ContainSubstring(fmt.Sprintf("Service instance %s not found", serviceName)), + ContainSubstring(fmt.Sprintf("Service instance '%s' not found", serviceName)), ContainSubstring("failed"), LongCfTimeout, ) @@ -152,6 +152,7 @@ func awaitServiceOperation( failureMessageMatcher types.GomegaMatcher, timeout time.Duration, ) { + GinkgoHelper() Eventually(func() bool { session := cfCommand() Expect(session).To(gexec.Exit())