Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/test/java/org/folio/rest/api/StorageTestSuite.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public class StorageTestSuite {
public static final String TENANT_ID = "test_tenant";

private static Vertx vertx;
private static String restVerticleId;
public static final int PROXY_PORT = NetworkUtils.nextFreePort();
public static final int OKAPI_MOCK_PORT = NetworkUtils.nextFreePort();
private static boolean initialised = false;
Expand Down Expand Up @@ -196,6 +197,12 @@ public static void after()
log.warn("after:: removeTenant failed (ignored): {}", e.getMessage());
}

try {
stopVerticle();
} catch (Throwable e) {
log.warn("after:: stopVerticle failed (ignored): {}", e.getMessage());
}

try {
kafkaContainer.stop();
} catch (Throwable e) {
Expand Down Expand Up @@ -309,7 +316,12 @@ private static void startVerticle(DeploymentOptions options)
.onSuccess(deploymentComplete::complete)
.onFailure(deploymentComplete::completeExceptionally);

deploymentComplete.get(30, TimeUnit.SECONDS);
restVerticleId = deploymentComplete.get(30, TimeUnit.SECONDS);
}

private static void stopVerticle() throws InterruptedException, ExecutionException, TimeoutException {
vertx.undeploy(restVerticleId)
.toCompletionStage().toCompletableFuture().get(5, TimeUnit.SECONDS);
}

static protected void prepareTenant(String tenantId, boolean loadSample) {
Expand Down
Loading