From c0cd9c65c63f70afe3aa3c52772d9d956fdb24fd Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Tue, 31 May 2016 03:18:10 +0300 Subject: [PATCH] Default test data path is not set as module root anymore. Too many data to index. --- .../env/PyExecutionFixtureTestTask.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java index f2de47ca10ae..3c2b0e521b39 100644 --- a/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java +++ b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java @@ -59,14 +59,24 @@ public abstract class PyExecutionFixtureTestTask extends PyTestTask { ModuleFixtureBuilder moduleFixtureBuilder = fixtureBuilder.addModule(MyModuleFixtureBuilder.class); moduleFixtureBuilder.addSourceContentRoot(myFixture.getTempDirPath()); - moduleFixtureBuilder.addSourceContentRoot(getTestDataPath()); + final String testDataPath = getTestDataPath(); + + final boolean customTestData = !testDataPath.equals(getDefaultTestDataPath()); + // No need to set default testdata as module root: too many data to index and useless + if (customTestData) { + moduleFixtureBuilder.addSourceContentRoot(testDataPath); + } final List contentRoots = getContentRoots(); for (String contentRoot : contentRoots) { - moduleFixtureBuilder.addContentRoot(getTestDataPath() + contentRoot); + moduleFixtureBuilder.addContentRoot(testDataPath + contentRoot); } myFixture.setUp(); - myFixture.setTestDataPath(getTestDataPath()); + myFixture.setTestDataPath(testDataPath); + } + + private static String getDefaultTestDataPath() { + return PythonTestUtil.getTestDataPath(); } protected List getContentRoots() { @@ -74,7 +84,7 @@ public abstract class PyExecutionFixtureTestTask extends PyTestTask { } protected String getTestDataPath() { - return PythonTestUtil.getTestDataPath(); + return getDefaultTestDataPath(); } protected void initFixtureBuilder() {