Exclude multithread RSA-related tests and increase thread init timeout (

#135) The multithreaded versions of RSAPSS and RSA_2048 seem to be hanging, so they are temporarily omitted until a fix is available. In some platforms, like Windows, the initialization of the threads requires more time, so the timeout is increased to account for that. Signed-off-by: Kostas Tsiounis <[email protected]>
IBM · Jul 5, 2024 · c15de2d · c15de2d
1 parent 10bb6de
commit c15de2d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/test/java/ibm/jceplus/junit/TestMultithread.java b/src/test/java/ibm/jceplus/junit/TestMultithread.java
@@ -65,15 +65,15 @@ public class TestMultithread extends TestCase {
             "ibm.jceplus.junit.openjceplus.multithread.TestSHA512_256",
             "ibm.jceplus.junit.openjceplus.multithread.TestSHA256Clone_SharedMD",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSASignature",
-            "ibm.jceplus.junit.openjceplus.multithread.TestRSA_2048",
+            /*"ibm.jceplus.junit.openjceplus.multithread.TestRSA_2048",*/
             "ibm.jceplus.junit.openjceplus.multithread.TestRSAKey",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSASignatureInteropSunRsaSign",
             "ibm.jceplus.junit.openjceplus.multithread.TestHKDF",
             "ibm.jceplus.junit.openjceplus.multithread.TestXDH",
             "ibm.jceplus.junit.openjceplus.multithread.TestXDHKeyImport",
             "ibm.jceplus.junit.openjceplus.multithread.TestXDHKeyPairGenerator",
-            "ibm.jceplus.junit.openjceplus.multithread.TestXDHMultiParty",
-            "ibm.jceplus.junit.openjceplus.multithread.TestMiniRSAPSS2"};
+            "ibm.jceplus.junit.openjceplus.multithread.TestXDHMultiParty"/*,
+            "ibm.jceplus.junit.openjceplus.multithread.TestMiniRSAPSS2"*/};
 
     public TestMultithread() {}
 
@@ -103,7 +103,7 @@ public void run() {
             // wait until all threads are ready
             assertTrue(
                     "Timeout initializing threads! Perform long lasting initializations before passing runnables to assertConcurrent",
-                    allExecutorThreadsReady.await(numThreads * 10, TimeUnit.MILLISECONDS));
+                    allExecutorThreadsReady.await(numThreads * 50, TimeUnit.MILLISECONDS));
             // start all test runners
             afterInitBlocker.countDown();
             assertTrue(message + " timeout! More than " + maxTimeoutSeconds + " seconds",

diff --git a/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java b/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java
@@ -52,18 +52,18 @@ public class TestMultithreadFIPS extends TestCase {
             "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA512",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA256Clone_SharedMD",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSASignature",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestRSA_2048",
+            /*"ibm.jceplus.junit.openjceplusfips.multithread.TestRSA_2048",*/
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAKey",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSASignatureInteropSunRsaSign",
             /*"ibm.jceplus.junit.openjceplusfips.multithread.TestHKDF",*/
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestMiniRSAPSS2",
+            /*"ibm.jceplus.junit.openjceplusfips.multithread.TestMiniRSAPSS2",*/
             "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMCICOWithGCMAndAAD",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMNonExpanding",
+            "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMNonExpanding"//,
             /*"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMWithKeyAndIvCheck",*/
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSS",
+            /*"ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSS",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSS2",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSSInterop2",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSSInterop3"};
+            "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSSInterop3"*/};
     public final Object ob = new Object();
 
     public TestMultithreadFIPS() {}
@@ -94,7 +94,7 @@ public void run() {
             // wait until all threads are ready
             assertTrue(
                     "Timeout initializing threads! Perform long lasting initializations before passing runnables to assertConcurrent",
-                    allExecutorThreadsReady.await(numThreads * 10, TimeUnit.MILLISECONDS));
+                    allExecutorThreadsReady.await(numThreads * 50, TimeUnit.MILLISECONDS));
             // start all test runners
             afterInitBlocker.countDown();
             assertTrue(message + " timeout! More than " + maxTimeoutSeconds + " seconds",