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 <[email protected]> Co-authored-by: Kim Bassett <[email protected]>
pivotal-cf · Jul 24, 2023 · c9f0fb1 · c9f0fb1
1 parent 123dceb
commit c9f0fb1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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())