aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-01-25 18:33:23 -0800
committerChris Rebert <[email protected]>2014-01-25 18:33:23 -0800
commit3157a3777536f1be7a8ccbb6170611492f9b2733 (patch)
tree569f07712a8a285f4ec5b6795af6951dd578344c
parent77362a3b457280c049239100cf2511669a81e677 (diff)
parent6717f642bb8dca8fb78dbe17c07209ba98091e2d (diff)
downloadbootstrap-3157a3777536f1be7a8ccbb6170611492f9b2733.tar.xz
bootstrap-3157a3777536f1be7a8ccbb6170611492f9b2733.zip
Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
-rw-r--r--test-infra/sauce_browsers.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/test-infra/sauce_browsers.yml b/test-infra/sauce_browsers.yml
index 5e37b7d980..9ec9c4cb1 100644
--- a/test-infra/sauce_browsers.yml
+++ b/test-infra/sauce_browsers.yml
@@ -5,12 +5,11 @@
browserName: "safari",
platform: "OS X 10.9"
},
- # FIXME: keeps timing out frequently for unknown reasons
- # {
- # browserName: "chrome",
- # platform: "OS X 10.9"
- # },
-
+ {
+ browserName: "chrome",
+ platform: "OS X 10.9",
+ version: "31"
+ },
{
browserName: "firefox",
platform: "OS X 10.9"