Bug 1390289 - whitelist xpi file r=jmaher

MozReview-Commit-ID: 6RBqG8Oob1a

--HG--
extra : rebase_source : 3f1f0f474cef27d0f6faadb08d52cd4f02d7257d

testing/talos/talos/whitelist.py

@@ -94,7 +94,7 @@ class Whitelist:
             elif filename in self.dependent_libs:
                 continue
             elif event_source_index is not None and \
-                    test[event_source_index] in self.expected_event_sources:
+                    row_key[event_source_index] in self.expected_event_sources:
                 continue
             else:
                 if filename not in errors:

testing/talos/talos/xtalos/etlparser.py

@@ -28,6 +28,9 @@ NUMBYTES_COL = "NumBytes"
 
 CEVT_WINDOWS_RESTORED = "{917b96b1-ecad-4dab-a760-8d49027748ae}"
 CEVT_XPCOM_SHUTDOWN = "{26d1e091-0ae7-4f49-a554-4214445c505c}"
+NAME_SUBSTITUTIONS = [
+    (re.compile(r'{\w{8}-\w{4}-\w{4}-\w{4}-\w{12}}'), '{uuid}')
+]
 stages = ["startup", "normal", "shutdown"]
 net_events = {
     "TcpDataTransferReceive": "recv",
@@ -275,6 +278,7 @@ def etlparser(xperf_path, etl_filename, processID, approot=None,
               configFile=None, outputFile=None, whitelist_file=None,
               error_filename=None, all_stages=False, all_threads=False,
               debug=False):
+    global NAME_SUBSTITUTIONS
 
     # setup output file
     if outputFile:
@@ -420,6 +424,9 @@ def etlparser(xperf_path, etl_filename, processID, approot=None,
         if len(parts) >= 2:
             filename = "%srefetch\\{prefetch}.pf" % parts[0]
 
+        for pattern, substitution in NAME_SUBSTITUTIONS:
+            filename = re.sub(pattern, substitution, filename)
+
         if filename in wl:
             if 'ignore' in wl[filename] and wl[filename]['ignore']:
                 continue

testing/talos/talos/xtalos/xperf_whitelist.json

@@ -6,6 +6,7 @@
  "C:\\$logfile": {"ignore": true},
  "{firefox}\\omni.ja": {"mincount": 0, "maxcount": 46, "minbytes": 0, "maxbytes": 3014656},
  "{firefox}\\browser\\omni.ja": {"mincount": 0, "maxcount": 28, "minbytes": 0, "maxbytes": 1835008},
+ "{firefox}\\browser\\extensions\\{uuid}.xpi": {"mincount": 0, "maxcount": 2, "minbytes": 0, "maxbytes": 8192},
  "{firefox}\\browser\\features\\aushelper@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\flyweb@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\formautofill@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
@@ -70,7 +71,10 @@
  "{profile}\\pluginreg.dat": {"mincount": 2, "maxcount": 2, "minbytes": 1892, "maxbytes": 1892},
  "{firefox}\\defaults\\pref\\channel-prefs.js": {"mincount": 4, "maxcount": 4, "minbytes": 1432, "maxbytes": 1432},
  "{profile}\\cert8.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 65536},
+ "{profile}\\cert9.db": {"mincount": 0, "maxcount": 18, "minbytes": 0, "maxbytes": 196968},
  "{profile}\\key3.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 32768},
+ "{profile}\\key4.db": {"mincount": 0, "maxcount": 16, "minbytes": 0, "maxbytes": 196936},
+ "{profile}\\pkcs11.txt": {"mincount": 0, "maxcount": 4, "minbytes": 0, "maxbytes": 16384},
  "{appdata}\\local\\temp": {"mincount": 0, "maxcount": 4, "minbytes": 0, "maxbytes": 278528},
  "{profile}\\favicons.sqlite": {"mincount": 8, "maxcount": 12, "minbytes": 196808, "maxbytes": 393216},
  "{profile}\\favicons.sqlite-shm": {"mincount": 0, "maxcount": 4, "minbytes": 65536, "maxbytes": 131072},