MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed PY-9971 Django Tests: invalid default test run configuration is created for django 1.6

Browse Source 
fixed PY-9244 Django Tests: invalid default test run configuration is created for test class and test method with django nose test runner
This commit is contained in:
Ekaterina Tuzova
2013-06-10 15:32:01 +04:00
parent eaa33687cc
commit 316b038102
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/testing/PyRerunFailedTestsAction.java
+4 -5
View File
@@ -16,7 +16,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.ComponentContainer;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
@@ -25,7 +24,6 @@ import com.jetbrains.django.testRunner.DjangoTestsRunConfiguration;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.run.AbstractPythonRunConfiguration;
import com.jetbrains.python.run.PythonCommandLineState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -102,8 +100,9 @@ public class PyRerunFailedTestsAction extends AbstractRerunFailedTestsAction {
final PsiElement element = location.getPsiElement();
if (getConfiguration() instanceof DjangoTestsRunConfiguration) {
String appName = DjangoTestUtil.getAppNameForLocation(location.getModule(), location.getPsiElement());
String target = DjangoTestUtil.buildTargetFromLocation(appName, element);
final Module module = location.getModule();
final String appName = DjangoTestUtil.getAppNameForLocation(module, location.getPsiElement());
final String target = DjangoTestUtil.buildTargetFromLocation(module, appName, element);
if (target != null)
specs.add(target);
}
@@ -112,7 +111,7 @@ public class PyRerunFailedTestsAction extends AbstractRerunFailedTestsAction {
PyFunction pyFunction = PsiTreeUtil.getParentOfType(element, PyFunction.class, false);
final VirtualFile virtualFile = location.getVirtualFile();
if (virtualFile != null) {
String path = location.getVirtualFile().getCanonicalPath();
String path = virtualFile.getCanonicalPath();
if (pyClass != null)
path += "::" + pyClass.getName();
if (pyFunction != null)