1 files changed, 17 insertions, 4 deletions
diff --git a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
index 4372715371eb..e29ab4cfdc8b 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
@@ -13,7 +13,7 @@ import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.PyDebuggerException;
 import com.jetbrains.python.debugger.PyExceptionBreakpointProperties;
 import com.jetbrains.python.debugger.PyExceptionBreakpointType;
-import com.jetbrains.python.debugger.pydev.ProcessDebugger;
+import com.jetbrains.python.debugger.pydev.PyDebugCallback;
 import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
 
 import java.util.List;
@@ -52,8 +52,12 @@ public class PythonDebuggerTest extends PyEnvTestCase {
     });
   }
 
-  public void testDebugger() {
-    runPythonTest(new PyUnitTestTask("", "test_debug.py") {
+  public void testPydevTests_Debugger() {
+    unittests("tests_python/test_debugger.py");
+  }
+
+  private void unittests(final String script) {
+    runPythonTest(new PyUnitTestTask("", script) {
       @Override
       protected String getTestDataPath() {
         return PythonHelpersLocator.getPythonCommunityPath() + "/helpers/pydev";
@@ -63,9 +67,18 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       public void after() {
         allTestsPassed();
       }
+
+      @Override
+      protected int getTestTimeout() {
+        return 600000;
+      }
     });
   }
 
+  public void testDebug() { //TODO: merge it into pydev tests
+    unittests("test_debug.py");
+  }
+
   public void testConditionalBreakpoint() throws Exception {
     runPythonTest(new PyDebuggerTask("/debug", "test1.py") {
       @Override
@@ -128,7 +141,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       private void consoleExec(String command) {
-        myDebugProcess.consoleExec(command, new ProcessDebugger.DebugCallback<String>() {
+        myDebugProcess.consoleExec(command, new PyDebugCallback<String>() {
           @Override
           public void ok(String value) {