Timeout increased

UnitTestBot · Aug 17, 2023 · 433d423 · 433d423
1 parent 94998e0
commit 433d423
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt b/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt
@@ -52,14 +52,16 @@ class InstrumentationProcessRunner(
                 listOf(instrumentedProcessClassName)
     }
 
-    private fun createWorkerProcessArgs(rdPort: Int, timeout: Int): List<String> =
-        listOf("-cp", testingProjectClasspath) + listOf("-t", "$timeout") + listOf("-p", "$rdPort")
+    private fun createWorkerProcessArgs(rdPort: Int): List<String> =
+        listOf("-cp", testingProjectClasspath) +
+        listOf("-t", "${InstrumentationModuleConstants.concreteExecutorProcessTimeout}") +
+        listOf("-p", "$rdPort")
 
     suspend fun init(parentLifetime: Lifetime) {
         val processLifetime = LifetimeDefinition(parentLifetime)
         lifetime = processLifetime
         val rdPort = NetUtils.findFreePort(0)
-        val workerCommand = jvmArgs + createWorkerProcessArgs(rdPort, 60)
+        val workerCommand = jvmArgs + createWorkerProcessArgs(rdPort)
         val pb = ProcessBuilder(workerCommand).inheritIO()
         val process = pb.start()
         rdProcessRunner =

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/constants.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/constants.kt
@@ -8,6 +8,8 @@ object InstrumentationModuleConstants {
 
     //Timeout for method execution
     val testExecutionTimeout = 10.seconds
+    //Timeout for executor process waiting (should be in seconds)
+    const val concreteExecutorProcessTimeout = 120
     //If something gone wrong with RD
     const val triesToRecreateExecutorRdProcess = 3
     //Rollback strategy

diff --git a/usvm-jvm/src/test/kotlin/org/usvm/samples/controlflow/CyclesTest.kt b/usvm-jvm/src/test/kotlin/org/usvm/samples/controlflow/CyclesTest.kt
@@ -105,7 +105,6 @@ internal class CyclesTest : JavaMethodTestRunner() {
     }
 
     @Test
-    @Disabled("CancellationException. Passing with increased timeout")
     fun moveToExceptionTest() {
         checkDiscoveredPropertiesWithExceptions(
             Cycles::moveToException,

diff --git a/usvm-jvm/src/test/kotlin/org/usvm/samples/recursion/RecursionTest.kt b/usvm-jvm/src/test/kotlin/org/usvm/samples/recursion/RecursionTest.kt
@@ -93,7 +93,6 @@ internal class RecursionTest : JavaMethodTestRunner() {
     }
 
     @Test
-    @Disabled("CancellationException. Probably test executor issue. Investigate")
     fun recursionWithExceptionTest() {
         checkDiscoveredPropertiesWithExceptions(
             Recursion::recursionWithException,