Fix tests now that Firefox latest returns the correct expiry date

See also: mozilla/geckodriver#463

remote_test.go

@@ -323,13 +323,20 @@ func testFirefoxPreferences(t *testing.T, c config) {
 		t.Fatalf("error in new session - %s", err)
 	}
 
-	u, err := wd.CurrentURL()
-	if err != nil {
-		t.Fatalf("wd.Current() returned error: %v", err)
-	}
-	if u != serverURL+"/" {
-		t.Fatalf("wd.Current() = %q, want %q", u, serverURL+"/")
+	// TODO(minusnine): use the upcoming Wait API for this.
+	var u string
+	for i := 0; i < 5; i++ {
+		var err error
+		u, err = wd.CurrentURL()
+		if err != nil {
+			t.Fatalf("wd.Current() returned error: %v", err)
+		}
+		if u == serverURL+"/" {
+			return
+		}
+		time.Sleep(time.Second)
 	}
+	t.Fatalf("wd.Current() = %q, want %q", u, serverURL+"/")
 }
 
 func testFirefoxProfile(t *testing.T, c config) {
@@ -1084,18 +1091,9 @@ func testAddCookie(t *testing.T, c config) {
 	want.Path = "/"
 	want.Domain = "127.0.0.1"
 
-	if c.browser == "firefox" {
-		if c.seleniumVersion.Major == 3 || c.seleniumVersion.Major == 0 && (c.sauce != nil && c.sauce.Platform != "Linux") {
-			// Geckodriver does not return the valid expiration date for the cookie.
-			// https://github.com/mozilla/geckodriver/issues/463
-			t.Log("Working around https://github.com/mozilla/geckodriver/issues/463")
-			want.Expiry = 0
-		}
-
-		// Firefox and Geckodriver now also returns an empty string for the path.
-		if c.seleniumVersion.Major == 0 && c.sauce == nil {
-			want.Path = ""
-		}
+	// Firefox and Geckodriver now returns an empty string for the path.
+	if c.browser == "firefox" && c.seleniumVersion.Major == 0 && c.sauce == nil {
+		want.Path = ""
 	}
 
 	cookies, err := wd.GetCookies()