From 838fcff7e7b48dcbfd2447666b5db3fe63c16a14 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 6 Jun 2017 09:57:06 -0400
Subject: [PATCH] Bug 1370328 - force plugins off and jsgc_poisoning for talos.
 r=rwood

MozReview-Commit-ID: 1ZLTUyHyYCH
---
 testing/talos/talos/config.py | 1 +
 testing/talos/talos/ttest.py  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py
index c88fa0f19634..ec6e34ce4f34 100644
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -179,6 +179,7 @@ DEFAULTS = dict(
         'devtools.theme': "light",
         'devtools.timeline.enabled': False,
         'identity.fxaccounts.migrateToDevEdition': False,
+        'plugin.state.flash': 0,
         'media.libavcodec.allow-obsolete': True
     }
 )
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 51448267cf56..0e03d2d666d4 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -104,6 +104,9 @@ class TTest(object):
             setup.env['MOZ_INSTRUMENT_EVENT_LOOP_INTERVAL'] = '10'
             global_counters['responsiveness'] = []
 
+        setup.env['JSGC_DISABLE_POISONING'] = '1'
+        setup.env['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = '1'
+
         # if using mitmproxy we must allow access to 'external' sites
         if browser_config.get('mitmproxy', False):
             LOG.info("Using mitmproxy so setting MOZ_DISABLE_NONLOCAL_CONNECTIONS to 0")