From 84c1d30e86a44579af9f8534331464b0fac16db8 Mon Sep 17 00:00:00 2001 From: Ben Grabham Date: Tue, 13 Dec 2016 12:06:02 +0000 Subject: [PATCH] Add kvs = null so that we correctly use the next kvs --- .../atlasdb/transaction/impl/TransactionTestSetup.java | 1 + .../atlasdb/keyvalue/MemorySerializableTransactionTest.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java index 518243e379f..efd06b5c453 100644 --- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java +++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java @@ -108,6 +108,7 @@ public void tearDown() { public static void tearDownKvs() { if (keyValueService != null) { keyValueService.close(); + keyValueService = null; } } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java index fc14bcd098b..ff321626c22 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java @@ -21,10 +21,8 @@ import com.palantir.common.concurrent.PTExecutors; public class MemorySerializableTransactionTest extends AbstractSerializableTransactionTest { - @Override protected KeyValueService getKeyValueService() { - return new InMemoryKeyValueService(false, PTExecutors.newSingleThreadExecutor(PTExecutors.newNamedThreadFactory(true))); + return new InMemoryKeyValueService(false, PTExecutors.newSingleThreadExecutor(PTExecutors.newNamedThreadFactory(false))); } - }