Harden contention regression tests

Author: peter-lawrey

src/test/java/net/openhft/chronicle/queue/ChronicleHistoryReaderMainTest.java

@@ -43,7 +43,8 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        System.setSecurityManager(null);
+        if (Jvm.majorVersion() < 17)
+            System.setSecurityManager(null);
     }
 
     @Test

src/test/java/net/openhft/chronicle/queue/ChronicleRollingIssueTest.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.LockSupport;
 
 import static net.openhft.chronicle.queue.rollcycles.TestRollCycles.TEST_SECONDLY;
 
@@ -39,9 +40,10 @@ public void tearDown() {
         IOTools.deleteDirWithFiles(path);
     }
 
-    @Test
+    @Test(timeout = 180_000L)
     public void test() throws InterruptedException {
-        int threads = Math.min(64, Runtime.getRuntime().availableProcessors() * 4) - 1;
+        int processors = Runtime.getRuntime().availableProcessors();
+        int threads = Math.max(2, Math.min(64, processors * 2) - 1);
         int messages = 100;
 
         AtomicInteger count = new AtomicInteger();
@@ -55,12 +57,12 @@ public void test() throws InterruptedException {
                     .rollCycle(TEST_SECONDLY).build();
                  ExcerptAppender appender = writeQueue.createAppender()) {
                 for (int i = 0; i < messages; i++) {
-                    long millis = System.currentTimeMillis() % 100;
-                    if (millis > 1 && millis < 99) {
-                        Jvm.pause(99 - millis);
-                    }
                     Map<String, Object> map = new HashMap<>();
                     map.put("key", Thread.currentThread().getName() + " - " + i);
+
+                    long nanos = System.nanoTime() % 100_000_000;
+                    // should cause them all to try to wake and write at the same time
+                    LockSupport.parkNanos(100_000_000 - nanos);
                     appender.writeMap(map);
                     count.incrementAndGet();
                 }

src/test/java/net/openhft/chronicle/queue/impl/single/AppenderFileHandleLeakTest.java

@@ -89,7 +89,7 @@ public void setUp() {
         queuePath = getTmpDir();
     }
 
-    @Test
+    @Test(timeout = 180_000L)
     public void appenderAndTailerResourcesShouldBeCleanedUpByGarbageCollection() throws InterruptedException, TimeoutException, ExecutionException {
         finishedNormally = false;
         try (ChronicleQueue queue = createQueue(SYSTEM_TIME_PROVIDER)) {
@@ -125,7 +125,7 @@ public void appenderAndTailerResourcesShouldBeCleanedUpByGarbageCollection() thr
         finishedNormally = true;
     }
 
-    @Test
+    @Test(timeout = 180_000L)
     public void tailerResourcesCanBeReleasedManually() throws Exception {
         FlakyTestRunner.builder(this::tailerResourcesCanBeReleasedManually0).build().run();
     }