Adding await to wait longer for service deletion

spring-cloud · Apr 18, 2023 · c0503d6 · c0503d6
1 parent 63dedf6
commit c0503d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle
@@ -29,6 +29,7 @@ dependencies {
 	testImplementation "io.projectreactor:reactor-test"
 	testImplementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
 	testImplementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
+	testImplementation "org.awaitility:awaitility"
 }
 
 // omit the version from the test broker jar file

diff --git a/...pringframework/cloud/appbroker/acceptance/UpdateInstanceWithNewServiceAcceptanceTest.java b/...pringframework/cloud/appbroker/acceptance/UpdateInstanceWithNewServiceAcceptanceTest.java
@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class UpdateInstanceWithNewServiceAcceptanceTest extends CloudFoundryAcceptanceTest {
@@ -140,7 +141,7 @@ void weUpdateTheServiceInstanceWithANewBackingService() {
 		assertThat(newBackingServiceInstance.getApplications()).contains(APP_NAME);
 
 		// and the old backing service is deleted
-		assertThat(listServiceInstances()).doesNotContain(OLD_BACKING_SI_NAME);
+		await().untilAsserted(() -> assertThat(listServiceInstances()).doesNotContain(OLD_BACKING_SI_NAME));
 
 		// then the service instance is deleted
 		deleteServiceInstance(SI_NAME);

diff --git a/...ework/cloud/appbroker/acceptance/UpdateInstanceWithNewServiceAndTargetAcceptanceTest.java b/...ework/cloud/appbroker/acceptance/UpdateInstanceWithNewServiceAndTargetAcceptanceTest.java
@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class UpdateInstanceWithNewServiceAndTargetAcceptanceTest extends CloudFoundryAcceptanceTest {
@@ -146,7 +147,7 @@ void weUpdateTheServiceInstanceWithANewBackingService() {
 		assertThat(newBackingServiceInstance.getApplications()).contains(APP_NAME);
 
 		// and the old backing service is deleted
-		assertThat(listServiceInstances()).doesNotContain(OLD_BACKING_SI_NAME);
+		await().untilAsserted(() -> assertThat(listServiceInstances()).doesNotContain(OLD_BACKING_SI_NAME));
 
 		// then the service instance is deleted
 		deleteServiceInstance(SI_NAME);