Back out bug 1083897 a=backout
authorBill McCloskey <wmccloskey@mozilla.com>
Tue, 14 Apr 2015 14:09:44 -0700
changeset 266699 56f805ac34ce750248a70276cd7d33f273ace6f5
parent 266698 4c24545641448116677ed3945703b973b5b6b91f
child 266700 8a54862698218225f2e6c583b0e72ce6e024e84d
push id2233
push usermozilla@noorenberghe.ca
push dateFri, 22 May 2015 21:06:00 +0000
reviewersbackout
bugs1083897
milestone38.0
Back out bug 1083897 a=backout
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -687,22 +687,17 @@ class MochitestOptions(optparse.OptionPa
             "default": options.defaultLeakThreshold,
             "tab": 25000,  # See dependencies of bug 1051230.
             # GMP rarely gets a log, but when it does, it leaks a little.
             "geckomediaplugin": 20000,
         }
 
         # Bug 1065098 - The geckomediaplugin process fails to produce a leak
         # log for some reason.
-        options.ignoreMissingLeaks = ["geckomediaplugin"]
-
-        # Bug 1091917 - We exit early in tab processes on Windows, so we don't
-        # get leak logs yet.
-        if mozinfo.isWin:
-            options.ignoreMissingLeaks.append("tab")
+        options.ignoreMissingLeaks = ["geckomediaplugin", "tab"]
 
         # Bug 1121539 - OSX-only intermittent tab process leak in test_ipc.html
         if mozinfo.isMac:
             options.leakThresholds["tab"] = 100000
 
         return options
 
 
@@ -908,15 +903,15 @@ class B2GOptions(MochitestOptions):
         options.app = temp
         options.sslPort = tempSSL
         options.httpPort = tempPort
 
         # Bug 1071866 - B2G Mochitests do not always produce a leak log.
         options.ignoreMissingLeaks.append("default")
 
         # Bug 1070068 - Leak logging does not work for tab processes on B2G.
-        options.ignoreMissingLeaks.append("tab")
+        assert "tab" in options.ignoreMissingLeaks, "Ignore failures for tab processes on B2G"
 
         return options
 
     def elf_arm(self, filename):
         data = open(filename, 'rb').read(20)
         return data[:4] == "\x7fELF" and ord(data[18]) == 40  # EM_ARM