Merge branch 2.3 into 3.0

neo4j · Jul 17, 2016 · 517a5c1 · 517a5c1
2 parents 5d8b9d4 + 8b00e3f
commit 517a5c1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
@@ -20,7 +20,6 @@
 package org.neo4j.ha;
 
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -32,8 +31,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.function.IntFunction;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.IntFunction;
 
 import org.neo4j.cluster.ClusterSettings;
 import org.neo4j.cluster.InstanceId;
@@ -46,14 +45,14 @@
 import org.neo4j.graphdb.TransientTransactionFailureException;
 import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.ha.HaSettings;
 import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase;
 import org.neo4j.kernel.impl.api.KernelTransactions;
 import org.neo4j.kernel.impl.ha.ClusterManager;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.shell.ShellClient;
 import org.neo4j.shell.ShellException;
 import org.neo4j.shell.ShellLobby;
@@ -131,7 +130,6 @@ public void makeSureUpdatePullerGetsGoingAfterMasterSwitch() throws Throwable
         awaitPropagation( 2, commonNodeId, cluster );
     }
 
-    @Ignore // TODO This test is not working as expected since 3.0
     @Test
     public void terminatedTransactionDoesNotForceUpdatePullingWithTxTerminationAwareLocks() throws Throwable
     {
@@ -140,6 +138,7 @@ public void terminatedTransactionDoesNotForceUpdatePullingWithTxTerminationAware
         ClusterManager clusterManager = new ClusterManager.Builder( root )
                 .withSharedConfig( MapUtil.stringMap(
                         HaSettings.pull_interval.name(), "0s",
+                        HaSettings.tx_push_factor.name(), "0",
                         KernelTransactions.tx_termination_aware_locks.name(), Settings.TRUE ) ).build();
         clusterManager.start();
         cluster = clusterManager.getCluster();