Bug 1331129 - get mainthreadio working in talos again, and clean up old entries in the mtio_whitelist.json. r=rwood

MozReview-Commit-ID: DoSVRTVLmhs

testing/talos/talos/config.py

@@ -195,7 +195,6 @@ GLOBAL_OVERRIDES = (
     'sps_profile_interval',
     'sps_profile_entries',
     'rss',
-    'mainthread',
     'shutdown',
     'tpcycles',
     'tpdelay',
@@ -356,7 +355,6 @@ def build_manifest(config, manifestName):
 
 def get_test(config, global_overrides, counters, test_instance):
     mozAfterPaint = getattr(test_instance, 'tpmozafterpaint', None)
-
     test_instance.update(**global_overrides)
 
     # update original value of mozAfterPaint, this could be 'false',

testing/talos/talos/mainthreadio.py

@@ -29,12 +29,21 @@ KEY_RUN_COUNT = 'RunCount'
 
 LEAKED_SYMLINK_PREFIX = "::\\{"
 
-PATH_SUBSTITUTIONS = {'profile': '{profile}', 'firefox': '{xre}',
+PATH_SUBSTITUTIONS = {'profile': '{profile}',
+                      'firefox': '{xre}',
                       'desktop': '{desktop}',
-                      'fonts': '{fonts}', 'appdata': ' {appdata}'}
-NAME_SUBSTITUTIONS = {'installtime': '{time}', 'prefetch': '{prefetch}',
+                      'fonts': '{fonts}',
+                      'appdata': ' {appdata}'}
+NAME_SUBSTITUTIONS = {'installtime': '{time}',
+                      'prefetch': '{prefetch}',
                       'thumbnails': '{thumbnails}',
-                      'windows media player': '{media_player}'}
+                      'windows media player': '{media_player}',
+                      # {appdata}\locallow\mozilla\temp-{*}
+                      'temp-{': '{temp}',
+                      # {appdata}\roaming\microsoft\windows\recent\customdestinations\*
+                      'customdestinations': '{customdestinations}',
+                      # {profile}\jumplistcache\w+hgqdp1iezlscab89jirg==.ico (*.ico)
+                      'jumplistcache': '{jumplist}'}
 
 TUPLE_FILENAME_INDEX = 2
 WHITELIST_FILENAME = os.path.join(SCRIPT_DIR, 'mtio-whitelist.json')

testing/talos/talos/mtio-whitelist.json

@@ -65,13 +65,9 @@
  "{FONTS}\\VRINDA.TTF": {},
  "{profile}": {},
  "{profile}\\": {},
- "{profile}\\_CACHE_CLEAN_": {},
- "{profile}\\addons.sqlite": {},
- "{profile}\\blocklist.xml": {},
- "{profile}\\Cache\\_CACHE_001_": {},
- "{profile}\\Cache\\_CACHE_002_": {},
- "{profile}\\Cache\\_CACHE_003_": {},
- "{profile}\\Cache\\_CACHE_MAP_": {},
+ "{profile}\\cache2\\index":  {},
+ "{profile}\\cache2\\index.log":  {},
+ "{profile}\\cache2\\index.tmp":  {},
  "{profile}\\cert8.db": {},
  "{profile}\\cookies.sqlite": {},
  "{profile}\\cookies.sqlite-journal": {},
@@ -90,48 +86,33 @@
  "{profile}\\extensions\\talos-powers@mozilla.org\\chrome\\talos-powers-content.js": {},
  "{profile}\\extensions\\talos-powers@mozilla.org\\components\\TalosPowersService.js": {},
  "{profile}\\key3.db": {},
- "{profile}\\localstore-1.rdf": {},
- "{profile}\\localstore.rdf": {},
- "{profile}\\pluginreg.dat": {},
- "{profile}\\pluginreg.dat.tmp": {},
  "{profile}\\plugins": {},
- "{profile}\\places.sqlite": {},
- "{profile}\\places.sqlite-journal": {},
- "{profile}\\places.sqlite-wal": {},
- "{profile}\\prefs-1.js": {},
+ "{profile}\\pluginreg.dat": {},
  "{profile}\\prefs.js": {},
+ "{profile}\\prefs-1.js": {},
  "{profile}\\searchplugins": {},
  "{profile}\\secmod.db": {},
- "{profile}\\startupCache\\startupCache.4.little": {},
- "{profile}\\cache2\\index": {},
- "{profile}\\cache2\\index.log": {},
- "{profile}\\cache2\\index.tmp": {},
- "{profile}\\Telemetry.ShutdownTime.txt.tmp": {},
- "{profile}\\{thumbnails}": {},
+ "{profile}\\telemetry.shutdowntime.txt.tmp": {},
+ "{profile}\\{jumplist}": {},
  "{xre}\\browser\\plugins": {},
- "{xre}\\browser\\searchplugins": {},
- "{xre}\\browser\\searchplugins\\yahoo.xml": {},
- "{xre}\\browser\\searchplugins\\twitter.xml": {},
- "{xre}\\browser\\searchplugins\\ebay.xml": {},
- "{xre}\\browser\\searchplugins\\amazondotcom.xml": {},
- "{xre}\\browser\\searchplugins\\bing.xml": {},
- "{xre}\\browser\\searchplugins\\ddg.xml": {},
- "{xre}\\browser\\searchplugins\\google.xml": {},
- "{xre}\\browser\\searchplugins\\wikipedia.xml": {},
- "{xre}\\distribution\\searchplugins": {},
- "c:\\users": {},
- "C:\\windows\\system32\\propsys.dll": {},
+ "C:": {},
  "C:\\Program Files\\NVIDIA Corporation\\3D Vision": {},
  "C:\\Program Files\\NVIDIA Corporation\\3D Vision\\npnv3dv.dll": {},
  "C:\\Program Files\\NVIDIA Corporation\\3D Vision\\npnv3dvstreaming.dll": {},
  "C:\\Program Files\\{media_player}": {},
- "c:\\users\\cltbld": {},
- "c:\\users\\cltbld\\appdata": {},
- "c:\\users\\cltbld\\appdata\\local": {},
+ "C:\\users": {},
+ "C:\\users\\cltbld": {},
+ "C:\\users\\cltbld\\appdata": {},
+ "C:\\users\\cltbld\\appdata\\local": {},
+ "C:\\slave": {},
+ "C:\\slave\\test": {},
+ "C:\\slave\\test\\build": {},
+ "C:\\slave\\test\\build\\application": {},
+ "C:\\windows\\system32\\propsys.dll": {},
  "{AppData}": {},
  "{AppData}\\local": {},
  "{AppData}\\local\\temp": {},
- "{AppData}\\locallow\\mozilla": {},
+ "{AppData}\\locallow\\mozilla\\{temp}": {},
  "{AppData}\\Roaming": {},
  "{AppData}\\roaming\\temp": {},
  "{AppData}\\roaming\\mozilla": {},
@@ -139,7 +120,11 @@
  "{AppData}\\Roaming\\Microsoft": {},
  "{AppData}\\Roaming\\Microsoft\\desktop.ini": {},
  "{AppData}\\Roaming\\Microsoft\\Windows": {},
+ "{AppData}\\roaming\\microsoft\\windows\\recent\\{customdestinations}":  {},
  "{Desktop}\\desktop.ini": {},
+ "{Desktop}.ini": {},
+ "{xre}": {},
+ "{xre}\\firefox.exe": {},
  "C:\\ProgramData": {},
  "C:\\ProgramData\\Microsoft\\desktop.ini": {},
  "C:\\ProgramData\\Microsoft": {},

testing/talos/talos/run_tests.py

@@ -92,7 +92,6 @@ def run_tests(config, browser_config):
 
     paths = ['profile_path', 'tpmanifest', 'extensions', 'setup', 'cleanup']
     for test in tests:
-
         # Check for profile_path, tpmanifest and interpolate based on Talos
         # root https://bugzilla.mozilla.org/show_bug.cgi?id=727711
         # Build command line from config