Bug 1325158: Part 5 - Re-enable leak checks for extension tests. r?jmaher draft
authorKris Maglione <maglione.k@gmail.com>
Thu, 29 Dec 2016 11:55:20 -0800
changeset 454931 331b667101d7a67b80db6812663d4232b8d557fc
parent 454930 9bf78b40dca8e94fde9cfe7eb9f8e04c83c2dfaa
child 540847 ea0f7d3a9cdb2a452f9f4f5184c99a1ae6ee7acc
push id40082
push usermaglione.k@gmail.com
push dateFri, 30 Dec 2016 19:18:45 +0000
reviewersjmaher
bugs1325158
milestone53.0a1
Bug 1325158: Part 5 - Re-enable leak checks for extension tests. r?jmaher MozReview-Commit-ID: DnwAa2cdw7c
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2211,18 +2211,18 @@ toolbar#nav-bar {
             # 1325148, but it couldn't land until all the regressions were also fixed or
             # backed out. Rather than waiting and risking new regressions, in the meantime
             # this code will selectively disable leak checking on flavors/directories where
             # known regressions exist. At least this way we can prevent further damage while
             # they get fixed.
 
             info = mozinfo.info
             skip_leak_conditions = [
-                (options.flavor in ('browser', 'chrome', 'plain') and d.startswith('toolkit/components/extensions/test/mochitest'), 'bug 1325158'),  # noqa
-                (info['debug'] and options.flavor == 'browser' and d.startswith('browser/components/extensions/test/browser'), 'bug 1325141'),  # noqa
+                (info['debug'] and options.flavor == 'plain' and d.startswith('toolkit/components/extensions/test/mochitest') and info['os'] == 'mac', 'bug 1326456'),  # noqa
+                (info['debug'] and options.flavor == 'browser' and d.startswith('browser/components/extensions/test/browser') and info['os'] == 'mac', 'bug 1325141'),  # noqa
                 (info['debug'] and options.flavor == 'plain' and d == 'dom/animation/test/css-animations', 'bug 1325277'),  # noqa
                 (info['debug'] and options.flavor == 'plain' and d == 'dom/tests/mochitest/gamepad' and info['os'] == 'win', 'bug 1324592'),  # noqa
                 (info['debug'] and options.flavor == 'plain' and d == 'toolkit/components/prompts/test' and info['os'] == 'mac', 'bug 1325275'),  # noqa
                 (info['debug'] and options.flavor == 'plain' and d == 'tests/dom/xhr/tests', 'bug 1325438'),  # noqa
             ]
 
             for condition, reason in skip_leak_conditions:
                 if condition: