Updated usvm-python-runner + small fixes

tochilinak · tochilinak · commit fabd51b6ab10 · 2023-11-27T13:33:05.000+03:00
diff --git a/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/sbft/SbftGenerateTestsCommand.kt b/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/sbft/SbftGenerateTestsCommand.kt
@@ -172,6 +172,7 @@ class SbftGenerateTestsCommand : CliktCommand(
 
         Cleaner.doCleaning()
         alreadySaved.set(true)
+        System.exit(0)
     }
 
     override fun run() {
diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(project(":utbot-python-parser"))
     api(project(":utbot-python-types"))
     api(project(":utbot-python-executor"))
-    api("org.usvm:usvm-python-runner:7b35ce5")
+    api("org.usvm:usvm-python-runner:b087c5c")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/engine/GlobalPythonEngine.kt b/utbot-python/src/main/kotlin/org/utbot/python/engine/GlobalPythonEngine.kt
@@ -85,7 +85,7 @@ class GlobalPythonEngine(
             usvmPythonConfig,
             configuration,
         )
-        val usvmConfig = USVMPythonRunConfig(config, until - System.currentTimeMillis(), configuration.timeoutForRun * 3)
+        val usvmConfig = USVMPythonRunConfig(config, until - System.currentTimeMillis(), configuration.timeoutForRun * 2)
         if (debug) {
             engine.debugRun(usvmConfig)
         } else {
@@ -158,4 +158,4 @@ class GlobalPythonEngine(
         visitor.visit(method.ast)
         return hintCollector
     }
-}
+}
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/USVMPythonAnalysisResultReceiverImpl.kt b/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/USVMPythonAnalysisResultReceiverImpl.kt
@@ -80,6 +80,7 @@ class USVMPythonAnalysisResultReceiverImpl(
 
     fun receivePickledInputValuesWithFeedback(pickledTuple: String): ExecutionFeedback? {
         try {
+            // logger.info("Receiving $pickledTuple")
             val coverageId = CoverageIdGenerator.createId()
             return when (
                 val evaluationResult = manager.runWithCoverage(pickledTuple, coverageId)
@@ -177,4 +178,4 @@ class USVMPythonAnalysisResultReceiverImpl(
             executionStorage.saveSymbolicExecution(it)
         }
     }
-}
+}
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/USVMPythonConfig.kt b/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/USVMPythonConfig.kt
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/UsvmConfig.kt b/utbot-python/src/main/kotlin/org/utbot/python/engine/symbolic/UsvmConfig.kt

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ class SbftGenerateTestsCommand : CliktCommand(`
`172`	`172`
`173`	`173`	`Cleaner.doCleaning()`
`174`	`174`	`alreadySaved.set(true)`
	`175`	`+ System.exit(0)`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`override fun run() {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class GlobalPythonEngine(`
`85`	`85`	`usvmPythonConfig,`
`86`	`86`	`configuration,`
`87`	`87`	`)`
`88`		`- val usvmConfig = USVMPythonRunConfig(config, until - System.currentTimeMillis(), configuration.timeoutForRun * 3)`
	`88`	`+ val usvmConfig = USVMPythonRunConfig(config, until - System.currentTimeMillis(), configuration.timeoutForRun * 2)`
`89`	`89`	`if (debug) {`
`90`	`90`	`engine.debugRun(usvmConfig)`
`91`	`91`	`} else {`
`@@ -158,4 +158,4 @@ class GlobalPythonEngine(`
`158`	`158`	`visitor.visit(method.ast)`
`159`	`159`	`return hintCollector`
`160`	`160`	`}`
`161`		`-}`
	`161`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ class USVMPythonAnalysisResultReceiverImpl(`
`80`	`80`
`81`	`81`	`fun receivePickledInputValuesWithFeedback(pickledTuple: String): ExecutionFeedback? {`
`82`	`82`	`try {`
	`83`	`+ // logger.info("Receiving $pickledTuple")`
`83`	`84`	`val coverageId = CoverageIdGenerator.createId()`
`84`	`85`	`return when (`
`85`	`86`	`val evaluationResult = manager.runWithCoverage(pickledTuple, coverageId)`
`@@ -177,4 +178,4 @@ class USVMPythonAnalysisResultReceiverImpl(`
`177`	`178`	`executionStorage.saveSymbolicExecution(it)`
`178`	`179`	`}`
`179`	`180`	`}`
`180`		`-}`
	`181`	`+}`