Backed out 2 changesets (bug 1572687) for causing bug 1574837. CLOSED TREE

Backed out changeset 0c1fa26f2f67 (bug 1572687)
Backed out changeset 2b3e775a99cb (bug 1572687)

testing/geckodriver/CHANGES.md

@@ -39,11 +39,6 @@ Unreleased
 
   Thanks to [Nupur Baghel] for this patch.
 
-- geckodriver now sets the `sanity-test.running` preference
-  to prevent Firefox from opening a graphic test window during
-  startup, which for some users never close, and stops
-  Marionette from initializing.
-
 ### Removed
 
 - Dropped support for legacy Selenium web element references

testing/geckodriver/src/prefs.rs

@@ -141,9 +141,6 @@ lazy_static! {
         // c.f. https://github.com/mozilla/geckodriver/issues/225.
         ("plugin.state.flash", Pref::new(0)),
 
-        // Disable the GFX sanity window
-        ("sanity-test.running", Pref::new(true)),
-
         // Don't do network connections for mitm priming
         ("security.certerrors.mitm.priming.enabled", Pref::new(false)),
 

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -122,9 +122,6 @@ class GeckoInstance(object):
         # Privacy and Tracking Protection
         "privacy.trackingprotection.enabled": False,
 
-        # Disable the GFX sanity window
-        "sanity-test.running": True,
-
         # Don't do network connections for mitm priming
         "security.certerrors.mitm.priming.enabled": False,
 

testing/marionette/harness/marionette_harness/tests/unit/test_prefs.py

@@ -29,9 +29,6 @@ class TestPreferences(MarionetteTestCase):
         super(TestPreferences, self).tearDown()
 
     def test_gecko_instance_preferences(self):
-        ignored_prefs = [
-            "sanity-test.running",  # will be reset during each startup
-        ]
         required_prefs = geckoinstance.GeckoInstance.required_prefs
 
         for key, value in required_prefs.iteritems():
@@ -43,10 +40,8 @@ class TestPreferences(MarionetteTestCase):
             if key == "extensions.shield-recipe-client.api_url":
                 self.assertEqual(self.marionette.get_pref("app.normandy.api_url"), value)
             else:
-                if key not in ignored_prefs:
-                    self.assertEqual(
-                        self.marionette.get_pref(key), value,
-                        "Preference {} hasn't been set to {}".format(key, repr(value)))
+                self.assertEqual(self.marionette.get_pref(key), value,
+                                 "Preference {} hasn't been set to {}".format(key, repr(value)))
 
     @skip_if_mobile("Only runnable with Firefox")
     def test_desktop_instance_preferences(self):