Skip to content

Fix pytest installation #1912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tamarinvs19 merged 1 commit into from
Mar 9, 2023
Merged

Fix pytest installation #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/PythonGenerateTestsCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ class PythonGenerateTestsCommand : CliktCommand(
installingRequirementsAction = {
logger.info("Installing requirements...")
},
testFrameworkInstallationAction = {
logger.info("Test framework installation...")
},
requirementsAreNotInstalledAction = ::processMissingRequirements,
startedLoadingPythonTypesAction = {
logger.info("Loading information about Python types...")
Expand Down
15 changes: 9 additions & 6 deletions ...python/src/main/kotlin/org/utbot/intellij/plugin/language/python/PythonDialogProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ object PythonDialogProcessor {
}
try {
val methods = findSelectedPythonMethods(model)
val requirementsList = requirements.toMutableList()
if (!model.testFramework.isInstalled) {
requirementsList += model.testFramework.mainPackage
}

processTestGeneration(
pythonPath = model.pythonPath,
Expand All @@ -185,9 +189,8 @@ object PythonDialogProcessor {
isCanceled = { indicator.isCanceled },
checkingRequirementsAction = { indicator.text = "Checking requirements" },
installingRequirementsAction = { indicator.text = "Installing requirements..." },
testFrameworkInstallationAction = { indicator.text = "Test framework installation" },
requirementsAreNotInstalledAction = {
askAndInstallRequirementsLater(model.project, model.pythonPath)
askAndInstallRequirementsLater(model.project, model.pythonPath, requirementsList)
PythonTestGenerationProcessor.MissingRequirementsActionResult.NOT_INSTALLED
},
startedLoadingPythonTypesAction = { indicator.text = "Loading information about Python types" },
Expand Down Expand Up @@ -245,11 +248,11 @@ object PythonDialogProcessor {
}
}

private fun askAndInstallRequirementsLater(project: Project, pythonPath: String) {
private fun askAndInstallRequirementsLater(project: Project, pythonPath: String, requirementsList: List<String>) {
val message = """
Some requirements are not installed.
Requirements: <br>
${requirements.joinToString("<br>")}
${requirementsList.joinToString("<br>")}
<br>
Install them?
""".trimIndent()
Expand All @@ -267,15 +270,15 @@ object PythonDialogProcessor {

ProgressManager.getInstance().run(object : Backgroundable(project, "Installing requirements") {
override fun run(indicator: ProgressIndicator) {
val installResult = installRequirements(pythonPath)
val installResult = installRequirements(pythonPath, requirementsList)

if (installResult.exitValue != 0) {
showErrorDialogLater(
project,
"Requirements installing failed.<br>" +
"${installResult.stderr}<br><br>" +
"Try to install with pip:<br>" +
" ${requirements.joinToString("<br>")}",
" ${requirementsList.joinToString("<br>")}",
"Requirements error"
)
}
Expand Down
10 changes: 0 additions & 10 deletions utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ package org.utbot.python

import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import mu.KotlinLogging
import org.parsers.python.PythonParser
import org.utbot.python.framework.codegen.model.PythonSysPathImport
import org.utbot.python.framework.codegen.model.PythonSystemImport
import org.utbot.python.framework.codegen.model.PythonUserImport
import org.utbot.framework.codegen.domain.TestFramework
import org.utbot.framework.codegen.domain.models.CgMethodTestSet
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.TimeoutException
import org.utbot.framework.plugin.api.UtClusterInfo
import org.utbot.framework.plugin.api.UtExecutionSuccess
import org.utbot.framework.plugin.api.util.UtContext
Expand All @@ -30,15 +28,12 @@ import org.utbot.python.newtyping.mypy.readMypyAnnotationStorageAndInitialErrors
import org.utbot.python.newtyping.mypy.setConfigFile
import org.utbot.python.typing.MypyAnnotations
import org.utbot.python.utils.Cleaner
import org.utbot.python.utils.RequirementsUtils.installRequirements
import org.utbot.python.utils.RequirementsUtils.requirementsAreInstalled
import org.utbot.python.utils.getLineOfFunction
import java.nio.file.Path
import kotlin.io.path.Path
import kotlin.io.path.pathString

private val logger = KotlinLogging.logger {}

object PythonTestGenerationProcessor {
fun processTestGeneration(
pythonPath: String,
Expand All @@ -58,7 +53,6 @@ object PythonTestGenerationProcessor {
isCanceled: () -> Boolean = { false },
checkingRequirementsAction: () -> Unit = {},
installingRequirementsAction: () -> Unit = {},
testFrameworkInstallationAction: () -> Unit = {},
requirementsAreNotInstalledAction: () -> MissingRequirementsActionResult = {
MissingRequirementsActionResult.NOT_INSTALLED
},
Expand All @@ -73,10 +67,6 @@ object PythonTestGenerationProcessor {
Cleaner.restart()

try {
if (!testFramework.isInstalled) {
testFrameworkInstallationAction()
installRequirements(pythonPath, listOf(testFramework.mainPackage))
}
if (!doNotCheckRequirements) {
checkingRequirementsAction()
if (!requirementsAreInstalled(pythonPath)) {
Expand Down