Bug 1388072 - Drop Marionette fallback prefs from geckodriver. r?automatedtester draft
authorAndreas Tolfsen <ato@sny.no>
Mon, 07 Aug 2017 16:13:54 +0100
changeset 642050 310058476e6ddb1b40d6fe0c3f8b5fddc62dedaa
parent 641632 47248637eafa9a38dade8dc3aa6c4736177c8d8d
child 724884 c8a9a6ccdc6d15c8110681ead26ae82e5249c75a
push id72625
push userbmo:ato@sny.no
push dateMon, 07 Aug 2017 15:22:35 +0000
reviewersautomatedtester
bugs1388072, 1344748
milestone57.0a1
Bug 1388072 - Drop Marionette fallback prefs from geckodriver. r?automatedtester The marionette.defaultPrefs.port and marionette.logging preferences were removed in https://bugzil.la/1344748, which shipped in Firefox 54. Because the next version of geckodriver (0.19.0) will only support Firefox 55 and greater, it is safe to remove the fallbacks. MozReview-Commit-ID: 4fhtoRasqyB
testing/geckodriver/src/marionette.rs
--- a/testing/geckodriver/src/marionette.rs
+++ b/testing/geckodriver/src/marionette.rs
@@ -483,23 +483,20 @@ impl MarionetteHandler {
         for &(ref name, ref value) in prefs::DEFAULT.iter() {
             if !custom_profile || !prefs.contains_key(name) {
                 prefs.insert((*name).clone(), (*value).clone());
             }
         }
 
         prefs.insert_slice(&extra_prefs[..]);
 
-        // fallbacks can be removed when Firefox 54 becomes stable
         if let Some(ref level) = self.current_log_level {
             prefs.insert("marionette.log.level", Pref::new(level.to_string()));
-            prefs.insert("marionette.logging", Pref::new(level.to_string()));  // fallback
         };
         prefs.insert("marionette.port", Pref::new(port as i64));
-        prefs.insert("marionette.defaultPrefs.port", Pref::new(port as i64));  // fallback
 
         prefs.write().map_err(|_| WebDriverError::new(ErrorStatus::UnknownError,
                                                       "Unable to write Firefox profile"))
     }
 }
 
 impl WebDriverHandler<GeckoExtensionRoute> for MarionetteHandler {
     fn handle_command(&mut self, _: &Option<Session>,