SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing flake when deletion succeeded

Browse Source 
Sometimes we go from IN_PROGRESS status to SUCCEEDED faster than we pull from the last_operation

Since SUCCEEDED  is the final expected status, an either  was added to consider this scenario
This commit is contained in:
Alberto Rios
2019-05-16 10:29:20 +02:00
parent 421aa0d1d0
commit f0d9c53de6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-app-broker-integration-tests/src/test/java/org.springframework.cloud.appbroker/integration/DeleteInstanceWithServicesComponentTest.java
View File

@@ -26,6 +26,7 @@ import org.springframework.test.context.TestPropertySource;
import static io.restassured.RestAssured.given;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.either;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithServicesComponentTest.APP_NAME;
@@ -134,7 +135,10 @@ class DeleteInstanceWithServicesComponentTest extends WiremockComponentTest {
.get(brokerFixture.getLastInstanceOperationUrl(), "instance-id")
.then()
.statusCode(HttpStatus.OK.value())
.body("state", is(equalTo(OperationState.IN_PROGRESS.toString())));
.body("state",
either(equalTo(OperationState.IN_PROGRESS.toString()))
// if the error occurs immediately it will return succeeded status
.or(equalTo(OperationState.SUCCEEDED.toString())));
String state = brokerFixture.waitForAsyncOperationComplete("instance-id");
assertThat(state).isEqualTo(OperationState.SUCCEEDED.toString());