Fix running tests coverage.

python/helpers/coverage_runner/run_coverage.py

@@ -2,7 +2,6 @@
 
 import os
 import sys
-import imp
 
 bundled_coverage_path = os.getenv('BUNDLED_COVERAGE_PATH')
 if bundled_coverage_path:
@@ -31,6 +30,16 @@ if run_cov:
     a_file.write(os.getcwd()+"\n")
     for path in sys.path: a_file.write(path + "\n")
     a_file.close()
+
+argv = []
+for arg in sys.argv:
+    if arg.startswith('-m'):
+        argv.append('-m')
+        argv.append(arg[2:])
+    else:
+        argv.append(arg)
+sys.argv = argv
+
 main()
 if run_cov:
     main(["xml", "-o", coverage_file + ".xml", "--ignore-errors"])

python/src/com/jetbrains/python/PythonHelpersLocator.java

@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 public enum PythonHelpersLocator implements PythonHelper {
-  COVERAGEPY("coveragepy", ""), COVERAGE("coverage", "run_coverage"),
+  COVERAGEPY("coveragepy", ""), COVERAGE("coverage_runner", "run_coverage"),
   DEBUGGER("pydev", "pydevd"),
   ATTACH_DEBUGGER("pydev", "pydevd_attach_to_process.attach_pydevd"),
 
@@ -203,7 +203,7 @@ public enum PythonHelpersLocator implements PythonHelper {
 
     @Override
     public String asParamString() {
-      return "-m " + myModuleName;
+      return "-m" + myModuleName;
     }
 
     @Override