From: Ian Jackson Date: Mon, 28 Dec 2020 23:41:50 +0000 (+0000) Subject: geckodriver args X-Git-Tag: otter-0.2.0~101 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6fc1b06bff2d2d86a2627557f3e4793f273ffc37;p=otter.git geckodriver args Signed-off-by: Ian Jackson --- diff --git a/wdriver.rs b/wdriver.rs index e52f2285..a412826f 100644 --- a/wdriver.rs +++ b/wdriver.rs @@ -106,6 +106,9 @@ struct Opts { #[structopt(long="--pause", default_value="0ms")] pause: humantime::Duration, + + #[structopt(long="--geckodriver-args", default_value="")] + geckodriver_args: String, } #[derive(Debug)] @@ -623,10 +626,10 @@ pub fn prepare_game(ds: &DirSubst, table: &str) -> InstanceName { } #[throws(AE)] -fn prepare_geckodriver(cln: &cleanup_notify::Handle) { +fn prepare_geckodriver(opts: &Opts, cln: &cleanup_notify::Handle) { const EXPECTED : &str = "Listening on 127.0.0.1:4444"; let mut cmd = Command::new("geckodriver"); - cmd.args(&["-v"]); + cmd.args(opts.geckodriver_args.split(' ')); let l = fork_something_which_prints(cmd, cln, "geckodriver")?; let fields : Vec<_> = l.split('\t').skip(2).take(2).collect(); let expected = ["INFO", EXPECTED]; @@ -858,7 +861,7 @@ pub fn setup(exe_module_path: &str) -> (Setup, Instance) { let final_hook = FinalInfoCollection; - prepare_geckodriver(&cln).always_context("setup webdriver server")?; + prepare_geckodriver(&opts, &cln).always_context("setup webdriver server")?; let (driver, screenshot_count, windows_squirreled) = prepare_thirtyfour().always_context("prepare web session")?;