diff --git a/wizard-server-test/pom.xml b/wizard-server-test/pom.xml
index 64bfb86..8c19a45 100644
--- a/wizard-server-test/pom.xml
+++ b/wizard-server-test/pom.xml
@@ -33,14 +33,12 @@ This code is available under the Apache License, version 2: http://www.apache.or
com.github.kstyrc
embedded-redis
0.6
-
ru.yandex.qatools.embed
postgresql-embedded
2.10
-
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
index fe03417..7470bc0 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
@@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j;
import org.cobbzilla.util.collection.SingletonList;
import org.cobbzilla.util.io.FileUtil;
import org.cobbzilla.util.jdbc.UncheckedSqlException;
-import org.cobbzilla.util.network.PortPicker;
import org.cobbzilla.util.system.Sleep;
import org.cobbzilla.wizard.client.ApiClientBase;
import org.cobbzilla.wizard.client.script.ApiRunner;
@@ -20,8 +19,10 @@ import org.cobbzilla.wizard.server.config.DatabaseConfiguration;
import org.cobbzilla.wizard.server.config.HasDatabaseConfiguration;
import org.cobbzilla.wizard.server.config.PgRestServerConfiguration;
import org.cobbzilla.wizard.server.config.RestServerConfiguration;
+import org.junit.AfterClass;
import org.junit.Before;
import redis.embedded.RedisServer;
+import ru.yandex.qatools.embed.postgresql.EmbeddedPostgres;
import java.io.File;
import java.io.IOException;
@@ -31,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import static java.lang.System.identityHashCode;
@@ -43,6 +43,7 @@ import static org.cobbzilla.util.reflect.ReflectionUtil.instantiate;
import static org.cobbzilla.util.system.CommandShell.execScript;
import static org.cobbzilla.wizard.model.entityconfig.ModelSetup.modelHash;
import static org.cobbzilla.wizard.model.entityconfig.ModelSetup.setupModel;
+import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V11;
@Slf4j
public abstract class ApiModelTestBase>
@@ -78,10 +79,12 @@ public abstract class ApiModelTestBase server) {
if (enableEmbeddedRedis()) {
@@ -95,6 +98,23 @@ public abstract class ApiModelTestBase server) {
+ @Override public void onStop(RestServer server) { cleanupServices(); }
+
+ @AfterClass public static void cleanupServices () {
if (redisServer != null) {
redisServer.stop();
+ redisServer = null;
+ redisPort = null;
+ }
+ if (pgServer != null) {
+ pgServer.stop();
+ pgServer = null;
+ pgPort = null;
}
}