Fix failing test

appveyor.yml

@@ -14,7 +14,7 @@ install:
   - choco install firefox 
   - curl -sSf -o rustup-init.exe https://win.rustup.rs
   - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Program Files (x86)\Mozilla Firefox;
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Program Files\Mozilla Firefox;
   - rustc -Vv
   - cargo -V
 

ff/src/runner.rs

@@ -29,7 +29,7 @@ fn spawn_firefox(firefox_bin: &Path, profile: &Path, marionette: bool) -> IoResu
 }
 
 #[cfg(windows)]
-fn spawn_firefox(firefox_bin: &Path, profile: &Path) -> IoResult<Child> {
+fn spawn_firefox(firefox_bin: &Path, profile: &Path, marionette: bool) -> IoResult<Child> {
     let mut cmd = Command::new(firefox_bin);
     if marionette {
         cmd.arg("-marionette");

ff/tests/userprefs.rs

@@ -7,17 +7,18 @@ use std::time::Duration;
 
 #[test]
 fn user_js_file() {
-    let browser = ff::Browser::start(65333,
+    let browser = ff::Browser::start(Some(65333),
                                          None,
                                          None,
                                          Some("tests/data/test-user.js"),
                                          None,
                                          None).unwrap();
 
-    ff::check_connection(browser.runner.port()).unwrap();
+    let port = browser.runner.port().unwrap();
+    ff::check_connection(port).unwrap();
 
     thread::sleep(Duration::new(5, 0));
-    let mut conn = MarionetteConnection::connect(browser.runner.port()).unwrap();
+    let mut conn = MarionetteConnection::connect(port).unwrap();
     let res = conn.get_pref("ff.testpref.canary").unwrap();
     assert_eq!(res, JsonValue::String("the canary is dead".to_string()));
     conn.quit().unwrap();

marionette/src/lib.rs

@@ -142,6 +142,18 @@ impl MarionetteConnection {
 
             conn.compatibility = compat;
             conn.timeouts = resp.capabilities.timeouts;
+
+            // Try to make sure the browser is live before returning
+            for retry in 0..4 {
+                match conn.get_title() {
+                    Ok(_) => break,
+                    Err(err) => {
+                        debug!("#{} Failed to connect to firefox({}): {}", retry, port, err);
+                        std::thread::sleep(std::time::Duration::new(retry*2, 0));
+                    }
+                }
+            }
+
             Ok(conn)
         } else {
             Err(MarionetteError::UnsupportedProtocolVersion)