Bug 1480870 - Summary:fix xperf imports and fix errors with NULL values in parsing csv rows. r=rwood

Differential Revision: https://phabricator.services.mozilla.com/D3022

--HG--
extra : moz-landing-system : lando

testing/talos/talos/test.py

@@ -495,7 +495,7 @@ class tp5n(PageloaderTest):
     tppagecycles = 1
     cycles = 1
     tpmozafterpaint = True
-    tptimeout = 5000
+    tptimeout = 10000
     mainthread = True
     w7_counters = []
     win_counters = []

testing/talos/talos/xtalos/__init__.py

@@ -1,5 +1,5 @@
 # xtalos: talos + xperf
 from __future__ import absolute_import
 
-from .start_xperf import start, start_from_config  # noqa
-from . import etlparser  # noqa
+from start_xperf import start, start_from_config  # noqa
+import etlparser  # noqa

testing/talos/talos/xtalos/etlparser.py

@@ -14,7 +14,7 @@ import subprocess
 import sys
 
 import mozfile
-from . import xtalos
+import xtalos
 
 EVENTNAME_INDEX = 0
 PROCESS_INDEX = 2
@@ -66,7 +66,15 @@ def filterOutHeader(data):
     # 0 means we are in the header
     # 1+ means that we are past the header
     state = -1
-    for row in data:
+    done = False
+    while not done:
+        try:
+            row = data.next()
+        except StopIteration:
+            done = True
+            break
+        except csv.Error:
+            continue
 
         if not len(row):
             continue

testing/talos/talos/xtalos/start_xperf.py

@@ -9,7 +9,7 @@ import os
 import subprocess
 import sys
 
-from . import xtalos
+import xtalos
 
 
 def start(xperf_path, xperf_providers, xperf_stackwalk, xperf_user_providers,

testing/talos/talos/xtalos/xperf_whitelist.json

@@ -14,6 +14,9 @@
   "c:\\$mft": {
     "ignore": true
   },
+  "z:\\$mft": {
+    "ignore": true
+  },
   "c:\\$secure": {
     "ignore": true
   },