corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1648964 - Pass double-dash options to Firefox, r=webdriver-reviewers,whimboo

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D81532
This commit is contained in:
James Graham
2020-07-27 13:10:29 +00:00
parent 3906081e08
commit 1580908410
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testing/geckodriver/src/android.rs
View File

@@ -236,8 +236,8 @@ impl AndroidHandler {
// TODO: Allow to write custom arguments and preferences from moz:firefoxOptions // TODO: Allow to write custom arguments and preferences from moz:firefoxOptions
let mut config = Config { let mut config = Config {
args: Value::Sequence(vec![ args: Value::Sequence(vec![
Value::String("-marionette".into()), Value::String("--marionette".into()),
Value::String("-profile".into()), Value::String("--profile".into()),
Value::String(self.profile.display().to_string()), Value::String(self.profile.display().to_string()),
]), ]),
env: Mapping::new(), env: Mapping::new(),
@@ -342,7 +342,7 @@ impl AndroidHandler {
intent_arguments.push("--es".to_owned()); intent_arguments.push("--es".to_owned());
intent_arguments.push("args".to_owned()); intent_arguments.push("args".to_owned());
intent_arguments intent_arguments
.push(format!("-marionette -profile {}", self.profile.display()).to_owned()); .push(format!("--marionette --profile {}", self.profile.display()).to_owned());
debug!("Launching {}/{}", process.package, process.activity); debug!("Launching {}/{}", process.package, process.activity);
process process

2
testing/geckodriver/src/capabilities.rs
View File

@@ -82,7 +82,7 @@ impl<'a> FirefoxCapabilities<'a> {
let version_regexp = Regex::new(r#"Mozilla Firefox [0-9]+\.[0-9]+(?:[a-z][0-9]+)?"#) let version_regexp = Regex::new(r#"Mozilla Firefox [0-9]+\.[0-9]+(?:[a-z][0-9]+)?"#)
.expect("Error parsing version regexp"); .expect("Error parsing version regexp");
let output = Command::new(binary) let output = Command::new(binary)
.args(&["-version"]) .args(&["--version"])
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.spawn() .spawn()
.and_then(|child| child.wait_with_output()) .and_then(|child| child.wait_with_output())

5
testing/geckodriver/src/marionette.rs
View File

@@ -252,10 +252,9 @@ impl MarionetteHandler {
let mut runner = FirefoxRunner::new(&binary, profile); let mut runner = FirefoxRunner::new(&binary, profile);
// double-dashed flags are not accepted on Windows systems runner.arg("--marionette");
runner.arg("-marionette");
if self.settings.jsdebugger { if self.settings.jsdebugger {
runner.arg("-jsdebugger"); runner.arg("--jsdebugger");
} }
if let Some(args) = options.args.as_ref() { if let Some(args) = options.args.as_ref() {
runner.args(args); runner.args(args);