PyDev fixes: fix issues found so far after rebase

python/helpers/pydev/_pydevd_bundle/pydevd_comm.py

@@ -728,7 +728,7 @@ class NetCommandFactory:
 
                 # Note: variables are all gotten 'on-demand'.
                 append('<frame id="%s" name="%s" ' % (my_id , make_valid_xml_value(method_name)))
-                append('file="%s" line="%s">' % (make_valid_xml_value(my_file, '/>_= \t'), lineno))
+                append('file="%s" line="%s">' % (quote(make_valid_xml_value(my_file), '/>_= \t'), lineno))
                 append("</frame>")
                 curr_frame = curr_frame.f_back
         except:

python/helpers/pydev/pydevd.py

@@ -1256,7 +1256,7 @@ class PyDB(object):
 
         self.patch_threads()
         if enable_tracing_from_start:
-            pydevd_tracing.SetTrace(self.trace_dispatch, self.frame_eval_func, self.dummy_trace_dispatch)
+            pydevd_tracing.SetTrace(self.trace_dispatch)
 
         PyDBCommandThread(self).start()
 

python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java

@@ -100,7 +100,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   @Test
   @Staging
   public void testFrameEvalAndTracing() {
-    unittests("tests_python/test_frame_eval_and_tracing.py", Sets.newHashSet("python3.6"), true);
+    pytests("tests_python/test_frame_eval_and_tracing.py", Sets.newHashSet("pytest", "-iron"));
   }
 
   private void pytests(final String script, @Nullable Set<String> tags) {