Permalink
Browse files

Merge pull request #53 from mozilla/latest-version

2.21 into master
  • Loading branch information...
2 parents 2b41e41 + f33cc72 commit d0a42c2d3ec802d0855c015914ec5946b190b1dc @davehunt davehunt committed May 9, 2012
View
2 default.properties
@@ -1,4 +1,4 @@
-selenium.version = 2.19.0
+selenium.version = 2.21.0
production.hostnames.regex = qa(\-selenium[0-9]*\.mv\.mozilla\.com|[0-9]*\-\w+)
nonaddressable.hostnames.regex = qa[0-9]*\-\w+
production.hub.host = qa-selenium.mv.mozilla.com
View
2 firefoxprofiles/certificateExceptions/cert_override.txt
@@ -1,6 +1,6 @@
# PSM Certificate Override Settings file
# This is a generated file! Do not edit.
-developer-stage9.mozilla.org:443 OID.2.16.840.1.101.3.4.2.1 72:13:40:17:77:BA:80:60:CF:4E:34:FF:4C:1A:E4:5F:90:35:B1:CD:6A:D5:34:B3:32:80:26:C1:3E:B7:12:D4 T AAAAAAAAAAAAAAADAAAAUA4lpjBOMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1 aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9y aXR5
+developer-stage9.mozilla.org:443 OID.2.16.840.1.101.3.4.2.1 C1:94:76:2E:43:A3:B0:9D:CA:9F:85:D2:82:39:42:26:DB:AD:CB:06:A9:89:4F:FC:F0:68:65:12:59:5F:E5:AD M AAAAAAAAAAAAAAADAAAAUBMN2jBOMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1 aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9y aXR5
support-release.allizom.org:443 OID.2.16.840.1.101.3.4.2.1 C7:43:B3:CD:F3:B3:AD:6B:3C:FF:4C:94:BB:3B:AE:0F:D0:C2:4D:28:20:16:D9:10:1C:88:39:6C:23:63:EF:BD U AAAAAAAAAAAAAAACAAAAQjK/MEAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9U cnVzdCwgSW5jLjEYMBYGA1UEAxMPR2VvVHJ1c3QgU1NMIENB
outgoing.stage.mozilla.com:443 OID.2.16.840.1.101.3.4.2.1 EC:BB:79:DE:B4:31:08:0A:2B:D7:0B:59:55:6D:CE:A0:7C:AE:04:32:8E:B2:AE:72:4E:30:CB:0A:03:E2:7F:F0 T AAAAAAAAAAAAAAADAAAAUA2qPzBOMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1 aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9y aXR5
kuma-stage.mozilla.org:443 OID.2.16.840.1.101.3.4.2.1 72:13:40:17:77:BA:80:60:CF:4E:34:FF:4C:1A:E4:5F:90:35:B1:CD:6A:D5:34:B3:32:80:26:C1:3E:B7:12:D4 T AAAAAAAAAAAAAAADAAAAUA4lpjBOMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1 aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9y aXR5
View
20 grid_configuration.yml
@@ -12,6 +12,8 @@ hub:
browser: "*firefox /Applications/Firefox 10.app/Contents/MacOS/firefox-bin"
- name: "Firefox 11 on Mac OS X"
browser: "*firefox /Applications/Firefox 11.app/Contents/MacOS/firefox-bin"
+ - name: "Firefox 12 on Mac OS X"
+ browser: "*firefox /Applications/Firefox 12.app/Contents/MacOS/firefox-bin"
- name: "Firefox Beta on Mac OS X"
browser: "*firefox /Applications/Firefox Beta.app/Contents/MacOS/firefox-bin"
- name: "Firefox Aurora on Mac OS X"
@@ -20,16 +22,12 @@ hub:
browser: "*firefox /Applications/Nightly.app/Contents/MacOS/firefox-bin"
- name: "Firefox 3.6 on Windows Vista"
browser: "*firefox C:/Program Files/Mozilla Firefox 3.6/firefox.exe"
- - name: "Firefox 7 on Windows Vista"
- browser: "*firefox C:/Program Files/Mozilla Firefox 7/firefox.exe"
- - name: "Firefox 8 on Windows Vista"
- browser: "*firefox C:/Program Files/Mozilla Firefox 8/firefox.exe"
- - name: "Firefox 9 on Windows Vista"
- browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
- name: "Firefox 10 on Windows Vista"
browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
- name: "Firefox 11 on Windows Vista"
browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
+ - name: "Firefox 12 on Windows Vista"
+ browser: "*firefox C:/Program Files/Mozilla Firefox 12/firefox.exe"
- name: "Firefox Beta on Windows Vista"
browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
- name: "Firefox Aurora on Windows Vista"
@@ -42,16 +40,12 @@ hub:
browser: "*iexplore"
- name: "Firefox 3.6 on Windows 7"
browser: "*firefox C:/Program Files/Mozilla Firefox 3.6/firefox.exe"
- - name: "Firefox 7 on Windows 7"
- browser: "*firefox C:/Program Files/Mozilla Firefox 7/firefox.exe"
- - name: "Firefox 8 on Windows 7"
- browser: "*firefox C:/Program Files/Mozilla Firefox 8/firefox.exe"
- - name: "Firefox 9 on Windows 7"
- browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
- name: "Firefox 10 on Windows 7"
browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
- name: "Firefox 11 on Windows 7"
- browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
+ browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
+ - name: "Firefox 12 on Windows 7"
+ browser: "*firefox C:/Program Files/Mozilla Firefox 12/firefox.exe"
- name: "Firefox Beta on Windows 7"
browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
- name: "Firefox Aurora on Windows 7"
View
3 hub_configuration.json
@@ -1,3 +1,4 @@
{
- "timeout": 180000
+ "timeout": 30000,
+ "browserTimeout": 180000
}
View
65 mac.json
@@ -6,18 +6,6 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox 7 on Mac OS X",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 8 on Mac OS X",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 9 on Mac OS X",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
"browserName": "Firefox 10 on Mac OS X",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
@@ -26,15 +14,7 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox Beta on Mac OS X",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Aurora on Mac OS X",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Nightly on Mac OS X",
+ "browserName": "Firefox 12 on Mac OS X",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
@@ -46,27 +26,6 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "7",
- "firefox_binary": "/Applications/Firefox 7.app/Contents/MacOS/firefox-bin",
- "platform": "MAC",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "8",
- "firefox_binary": "/Applications/Firefox 8.app/Contents/MacOS/firefox-bin",
- "platform": "MAC",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "9",
- "firefox_binary": "/Applications/Firefox 9.app/Contents/MacOS/firefox-bin",
- "platform": "MAC",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
"version": "10",
"firefox_binary": "/Applications/Firefox 10.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
@@ -81,28 +40,12 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "beta",
- "firefox_binary": "/Applications/Firefox Beta.app/Contents/MacOS/firefox-bin",
- "platform": "MAC",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "aurora",
- "firefox_binary": "/Applications/Aurora.app/Contents/MacOS/firefox-bin",
- "platform": "MAC",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "nightly",
- "firefox_binary": "/Applications/Nightly.app/Contents/MacOS/firefox-bin",
+ "version": "12",
+ "firefox_binary": "/Applications/Firefox 12.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}
],
- "configuration": {
- "timeout": 180000
- }
+ "configuration": {}
}
View
117 qa-selenium3.mv.mozilla.com.json
@@ -0,0 +1,117 @@
+{
+ "capabilities":
+ [
+ {
+ "browserName": "Firefox 3.6 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 7 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 8 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 9 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 10 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 11 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox 12 on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox Beta on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox Aurora on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "Firefox Nightly on Mac OS X",
+ "maxInstances": 5,
+ "seleniumProtocol": "Selenium"
+ }, {
+ "browserName": "firefox",
+ "version": "3.6",
+ "firefox_binary": "/Applications/Firefox 3.6.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "7",
+ "firefox_binary": "/Applications/Firefox 7.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "8",
+ "firefox_binary": "/Applications/Firefox 8.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "9",
+ "firefox_binary": "/Applications/Firefox 9.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "10",
+ "firefox_binary": "/Applications/Firefox 10.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "11",
+ "firefox_binary": "/Applications/Firefox 11.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "12",
+ "firefox_binary": "/Applications/Firefox 12.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "beta",
+ "firefox_binary": "/Applications/Firefox Beta.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "aurora",
+ "firefox_binary": "/Applications/Aurora.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }, {
+ "browserName": "firefox",
+ "version": "nightly",
+ "firefox_binary": "/Applications/Nightly.app/Contents/MacOS/firefox-bin",
+ "platform": "MAC",
+ "maxInstances": 1,
+ "seleniumProtocol": "WebDriver"
+ }
+ ],
+ "configuration": {}
+}
View
1 qa-selenium3.mv.mozilla.com.properties
@@ -0,0 +1 @@
+node.configuration.file=qa-selenium3.mv.mozilla.com.json
View
65 win7.json
@@ -6,18 +6,6 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox 7 on Windows 7",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 8 on Windows 7",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 9 on Windows 7",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
"browserName": "Firefox 10 on Windows 7",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
@@ -26,15 +14,7 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox Beta on Windows 7",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Aurora on Windows 7",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Nightly on Windows 7",
+ "browserName": "Firefox 12 on Windows 7",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
@@ -50,27 +30,6 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "7",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 7/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "8",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 8/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "9",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 9/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
"version": "10",
"firefox_binary": "C:/Program Files/Mozilla Firefox 10/firefox.exe",
"platform": "WINDOWS",
@@ -85,22 +44,8 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "beta",
- "firefox_binary": "C:/Program Files/Mozilla Firefox Beta/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "aurora",
- "firefox_binary": "C:/Program Files/Aurora/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "nightly",
- "firefox_binary": "C:/Program Files/Nightly/firefox.exe",
+ "version": "12",
+ "firefox_binary": "C:/Program Files/Mozilla Firefox 12/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
@@ -112,7 +57,5 @@
"seleniumProtocol": "WebDriver"
}
],
- "configuration": {
- "timeout": 180000
- }
+ "configuration": {}
}
View
65 winvista.json
@@ -6,18 +6,6 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox 7 on Windows Vista",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 8 on Windows Vista",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox 9 on Windows Vista",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
"browserName": "Firefox 10 on Windows Vista",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
@@ -26,15 +14,7 @@
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
- "browserName": "Firefox Beta on Windows Vista",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Aurora on Windows Vista",
- "maxInstances": 5,
- "seleniumProtocol": "Selenium"
- }, {
- "browserName": "Firefox Nightly on Windows Vista",
+ "browserName": "Firefox 12 on Windows Vista",
"maxInstances": 5,
"seleniumProtocol": "Selenium"
}, {
@@ -50,27 +30,6 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "7",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 7/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "8",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 8/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "9",
- "firefox_binary": "C:/Program Files/Mozilla Firefox 9/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
"version": "10",
"firefox_binary": "C:/Program Files/Mozilla Firefox 10/firefox.exe",
"platform": "WINDOWS",
@@ -85,22 +44,8 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
- "version": "beta",
- "firefox_binary": "C:/Program Files/Mozilla Firefox Beta/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "aurora",
- "firefox_binary": "C:/Program Files/Aurora/firefox.exe",
- "platform": "WINDOWS",
- "maxInstances": 1,
- "seleniumProtocol": "WebDriver"
- }, {
- "browserName": "firefox",
- "version": "nightly",
- "firefox_binary": "C:/Program Files/Nightly/firefox.exe",
+ "version": "12",
+ "firefox_binary": "C:/Program Files/Mozilla Firefox 12/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
@@ -112,7 +57,5 @@
"seleniumProtocol": "WebDriver"
}
],
- "configuration": {
- "timeout": 180000
- }
+ "configuration": {}
}

0 comments on commit d0a42c2

Please sign in to comment.