Bug 1390289 - whitelist xpi file r?jmaher; try: -b do -p win32,win32-pgo -u none -t other-e10s,tp5o-e10s,tp6-e10s,xperf-e10s --rebuild-talos 5 intermittent
authorIonut Goldan <igoldan@mozilla.com>
Mon, 06 Nov 2017 17:10:31 +0200
changeset 1347721 578c9f3d3204ce103efaa87de984cd97a2cb8d06
parent 1347473 ed94dc665071d8d510688ff50bbedad2c7cb33ee
child 1589709 11b15e4f2ee00e24d5dccf9e4d8951a9690d1aff
push id234553
push userigoldan@mozilla.com
push dateFri, 10 Nov 2017 07:39:56 +0000
treeherdertry@578c9f3d3204 [default view] [failures only]
reviewersjmaher, try
bugs1390289
milestone58.0a1
Bug 1390289 - whitelist xpi file r?jmaher; try: -b do -p win32,win32-pgo -u none -t other-e10s,tp5o-e10s,tp6-e10s,xperf-e10s --rebuild-talos 5 MozReview-Commit-ID: 6RBqG8Oob1a
testing/talos/talos/whitelist.py
testing/talos/talos/xtalos/etlparser.py
testing/talos/talos/xtalos/xperf_whitelist.json
--- a/testing/talos/talos/whitelist.py
+++ b/testing/talos/talos/whitelist.py
@@ -89,17 +89,17 @@ class Whitelist:
 
             if filename in self.listmap:
                 if 'ignore' in self.listmap[filename] and \
                         self.listmap[filename]['ignore']:
                     continue
             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:
                     errors[filename] = []
                 errors[filename].append(test[row_key])
         return errors
 
     def checkDuration(self, test, file_name_index, file_duration_index):
--- a/testing/talos/talos/xtalos/etlparser.py
+++ b/testing/talos/talos/xtalos/etlparser.py
@@ -23,16 +23,19 @@ DISKBYTES_COL = "Size"
 FNAME_COL = "FileName"
 IMAGEFUNC_COL = "Image!Function"
 EVENTGUID_COL = "EventGuid"
 ACTIVITY_ID_COL = "etw:ActivityId"
 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",
     "UdpEndpointReceiveMessages": "recv",
     "TcpDataTransferSend": "send",
     "UdpEndpointSendMessages": "send"
 }
 gThreads = {}
@@ -270,16 +273,17 @@ def checkWhitelist(filename, whitelist):
             return True
     return False
 
 
 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:
         outFile = open(outputFile, 'w')
     else:
         outFile = sys.stdout
 
     files = {}
@@ -415,16 +419,19 @@ def etlparser(xperf_path, etl_filename, 
             filename = "%s\\{time}" % parts[0]
 
         # NOTE: this is Prefetch or prefetch, not case sensitive operating
         # system
         parts = filename.split('refetch')
         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
 
 # too noisy
 #            if wl[filename]['minbytes'] > (files[row]['DiskReadBytes'] +\
 #                   files[row]['DiskWriteBytes']):
 #                print "%s: read %s bytes, less than expected minimum: %s"
--- a/testing/talos/talos/xtalos/xperf_whitelist.json
+++ b/testing/talos/talos/xtalos/xperf_whitelist.json
@@ -1,16 +1,17 @@
 {"{firefox}\\Crash Reports\\{time}": {"ignore": true},
  "C:\\$Mft": {"ignore": true},
  "C:\\$Extend\\$UsnJrnl:$J": {"ignore": true},
  "C:\\Windows\\Prefetch\\{prefetch}.pf": {"ignore": true},
  "C:\\$Secure": {"ignore": true},
  "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},
  "{firefox}\\browser\\features\\loop@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\firefox@getpocket.com.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\presentation@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\webcompat@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
  "{firefox}\\browser\\features\\webcompat-reporter@mozilla.org.xpi": {"mincount": 0, "maxcount": 100, "minbytes": 0, "maxbytes": 10000000},
@@ -65,17 +66,20 @@
  "{profile}\\user.js": {"mincount": 4, "maxcount": 4, "minbytes": 6000, "maxbytes": 6000},
  "{profile}\\mimetypes.rdf": {"mincount": 2, "maxcount": 2, "minbytes": 8192, "maxbytes": 8192},
  "{profile}\\prefs-1.js": {"mincount": 0, "maxcount": 10, "minbytes": 0, "maxbytes": 53950},
  "{profile}\\xulstore.json": {"mincount": 0, "maxcount": 0, "minbytes": 0, "maxbytes": 702},
  "{profile}\\secmod.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 32768},
  "{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},
  "{profile}\\favicons.sqlite-wal": {"mincount": 0, "maxcount": 32, "minbytes": 0, "maxbytes": 131072},
  "c:\\windows\\system32\\msctf.dll":  {"mincount": 0, "maxcount": 2, "minbytes": 0, "maxbytes": 65536},
  "{profile}\\handlers.json":  {"mincount": 0, "maxcount": 4, "minbytes": 0, "maxbytes": 1388},
  "{profile}\\startupcache":  {"mincount": 0, "maxcount": 2, "minbytes": 0, "maxbytes": 8192},
  "{profile}\\sessionstore.js":  {"mincount": 0, "maxcount": 2, "minbytes": 0, "maxbytes": 4096},