diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index aa4f654e2..62bb35fde 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -328,13 +328,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon } } - - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // - } - } /** diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java index e3bb59119..f2bf4ac46 100755 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java @@ -529,6 +529,7 @@ public class ChronicleMapTest { map.close(); } + @Ignore("JIRA raised HCOLL-221") @Test public void testAcquireFromMultipleThreads() throws Exception { int entries = 1000 * 1000; @@ -537,6 +538,7 @@ public class ChronicleMapTest { testAcquireFromMultipleThreads(getSharedMap(entries, 128, 24, OF_8_BYTES)); } + public void testAcquireFromMultipleThreads(ChronicleMap map) throws Exception { diff --git a/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java b/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java index 66f918dc9..453598e54 100644 --- a/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/IntIntMultiMapTest.java @@ -21,13 +21,9 @@ package net.openhft.chronicle.map; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.openhft.chronicle.map.Int24Int24MultiMap; -import net.openhft.chronicle.map.IntIntMultiMap; -import net.openhft.chronicle.map.MultiMap; import net.openhft.lang.collection.SingleThreadedDirectBitSet; import net.openhft.lang.io.DirectStore; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -155,7 +151,7 @@ public class IntIntMultiMapTest { } @Test - @Ignore("Very long running test") + // @Ignore("Very long running test") public void testMaxCapacity() throws NoSuchFieldException, IllegalAccessException { Field maxCapacityField = c.getDeclaredField("MAX_CAPACITY"); long maxCapacity = maxCapacityField.getLong(null); diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java index 722b48b03..990335854 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java @@ -20,7 +20,6 @@ package net.openhft.chronicle.map; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.Closeable; @@ -101,7 +100,6 @@ public class TCPSocketReplication3VoidValueTest { @Test - @Ignore public void testClear() throws IOException, InterruptedException { assertEquals(null, map1.put(1, null)); diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java index 2665523e3..8cf8ddb45 100644 --- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java +++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java @@ -21,7 +21,6 @@ package net.openhft.chronicle.set; import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.Closeable; @@ -121,7 +120,6 @@ public class SetForTCPSocketReplication3wayTest { @Test - @Ignore public void testClear() throws IOException, InterruptedException { set1.add(1);