|
63 | 63 | import org.cloudfoundry.client.v3.domains.CreateDomainRequest;
|
64 | 64 | import org.cloudfoundry.client.v3.domains.CreateDomainResponse;
|
65 | 65 | import org.cloudfoundry.client.v3.domains.DomainRelationships;
|
66 |
| -import org.cloudfoundry.client.v3.droplets.DropletResource; |
67 |
| -import org.cloudfoundry.client.v3.droplets.ListDropletsRequest; |
68 | 66 | import org.cloudfoundry.client.v3.organizations.CreateOrganizationRequest;
|
69 | 67 | import org.cloudfoundry.client.v3.organizations.CreateOrganizationResponse;
|
70 | 68 | import org.cloudfoundry.client.v3.packages.CreatePackageRequest;
|
|
93 | 91 | import org.junit.Test;
|
94 | 92 | import org.springframework.beans.factory.annotation.Autowired;
|
95 | 93 | import org.springframework.core.io.ClassPathResource;
|
96 |
| -import reactor.core.publisher.Flux; |
97 | 94 | import reactor.core.publisher.Mono;
|
98 | 95 | import reactor.test.StepVerifier;
|
99 | 96 | import reactor.util.function.Tuples;
|
@@ -667,16 +664,18 @@ public void restart() {
|
667 | 664 | .flatMap(spaceId -> createApplicationId(this.cloudFoundryClient, applicationName, spaceId))
|
668 | 665 | .delayUntil(applicationId -> prepareApplicationToStart(this.cloudFoundryClient, applicationId))
|
669 | 666 | .delayUntil(applicationId -> requestStartApplication(this.cloudFoundryClient, applicationId))
|
670 |
| - .flatMap(applicationId -> requestGetApplication(this.cloudFoundryClient, applicationId) |
671 |
| - .map(application -> Instant.parse(application.getUpdatedAt())) |
| 667 | + .flatMap(applicationId -> requestApplicationProcess(this.cloudFoundryClient, applicationId) |
| 668 | + .map(process -> Instant.parse(process.getUpdatedAt())) |
672 | 669 | .map(updatedAt -> Tuples.of(applicationId, updatedAt)))
|
673 | 670 | .delayUntil(function((applicationId, oldUpdatedAt) -> this.cloudFoundryClient.applicationsV3()
|
674 | 671 | .restart(RestartApplicationRequest.builder()
|
675 | 672 | .applicationId(applicationId)
|
676 |
| - .build()))) |
677 |
| - .flatMap(function((applicationId, oldUpdatedAt) -> requestGetApplication(this.cloudFoundryClient, applicationId) |
678 |
| - .map(application -> Instant.parse(application.getUpdatedAt())) |
679 |
| - .map(newUpdatedAt -> Tuples.of(oldUpdatedAt, newUpdatedAt)))) |
| 673 | + .build()) |
| 674 | + .delaySubscription(Duration.ofSeconds(2)))) |
| 675 | + .flatMap(function((applicationId, oldUpdatedAt) -> requestApplicationProcess(this.cloudFoundryClient, applicationId) |
| 676 | + .map(process -> Instant.parse(process.getUpdatedAt())) |
| 677 | + .map(newUpdatedAt -> Tuples.of(oldUpdatedAt, newUpdatedAt)) |
| 678 | + .delaySubscription(Duration.ofSeconds(2)))) |
680 | 679 | .as(StepVerifier::create)
|
681 | 680 | .consumeNextWith(consumer((oldUpdatedAt, newUpdatedAt) -> assertThat(newUpdatedAt).isAfter(oldUpdatedAt)))
|
682 | 681 | .expectComplete()
|
@@ -817,6 +816,7 @@ private static Mono<Boolean> getFeatureEnabled(CloudFoundryClient cloudFoundryCl
|
817 | 816 | }
|
818 | 817 |
|
819 | 818 | private static Mono<GetApplicationProcessResponse> requestApplicationProcess(CloudFoundryClient cloudFoundryClient, String applicationId) {
|
| 819 | + System.out.println(Instant.now()); |
820 | 820 | return cloudFoundryClient.applicationsV3()
|
821 | 821 | .getProcess(GetApplicationProcessRequest.builder()
|
822 | 822 | .applicationId(applicationId)
|
|
0 commit comments