From 55eac82f36a887f124eb20634fbdd49910e3ed11 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 23 Jun 2016 18:00:58 +0200 Subject: [PATCH 1/2] Move to staging until thread leak problem is solved. --- python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java index cc926ef52568..92b3dfe2914a 100644 --- a/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java +++ b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java @@ -9,6 +9,7 @@ import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.Staging; import com.jetbrains.env.python.console.PyConsoleTask; import org.hamcrest.Matchers; import org.jetbrains.annotations.NotNull; @@ -38,6 +39,7 @@ public class IPythonConsoleTest extends PyEnvTestCase { } @Test + @Staging public void testParsing() throws Exception { runPythonTest(new IPythonTask() { @Override From e30512c551d4a6dd5be2834a9eefc8b76e500097 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 23 Jun 2016 20:10:12 +0200 Subject: [PATCH 2/2] Fix building profile call graph (PY-19862) --- python/helpers/profiler/profiler.thrift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/helpers/profiler/profiler.thrift b/python/helpers/profiler/profiler.thrift index db10645c181b..352e95b9f829 100644 --- a/python/helpers/profiler/profiler.thrift +++ b/python/helpers/profiler/profiler.thrift @@ -11,7 +11,7 @@ struct FuncStat { struct Function { 1: required FuncStat func_stat, - 2: optional list callers, // list of functions called from the executed function. + 2: required list callers, // list of functions called from the executed function. }