From 3fead94c23f2162ec89f3ac1088446c374f3ff6e Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Sat, 10 Jun 2017 01:29:38 +0300 Subject: [PATCH] PY-24010: Set module explicitly from context before getTargetForConfig To prevent cases like PY-24302 and PY-24010 we should set module from context. After module renaming or in case of two modules configuration.module is wrong. Hence we set it from context. --- python/src/com/jetbrains/python/testing/PyTestsShared.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/testing/PyTestsShared.kt b/python/src/com/jetbrains/python/testing/PyTestsShared.kt index 99248c7ffbce..70625456c9a7 100644 --- a/python/src/com/jetbrains/python/testing/PyTestsShared.kt +++ b/python/src/com/jetbrains/python/testing/PyTestsShared.kt @@ -625,6 +625,7 @@ object PyTestsConfigurationProducer : com.jetbrains.python.testing.AbstractPytho } val location = context?.location + configuration.module = context?.module if (location is com.jetbrains.python.testing.PyTargetBasedPsiLocation) { location.target.copyTo(configuration.target) } @@ -637,7 +638,6 @@ object PyTestsConfigurationProducer : com.jetbrains.python.testing.AbstractPytho configuration.workingDirectory = targetForConfig.second } } - configuration.module = context?.module configuration.setGeneratedName() return true }