Commit 41ca8c49 authored by chrisgao@chromium.org's avatar chrisgao@chromium.org

[chromedriver] Run tests against 27.

Also, add an option 'chrome-version' to run_all_tests.py so that we can run tests on a specified version of chrome.
And disable one failed java test on Win7.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/13827002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192967 0039d316-1c4b-4281-b951-d872f2087c98
parent c1ca6584
......@@ -14,6 +14,7 @@ sys.path.insert(0, os.path.join(_THIS_DIR, os.pardir, 'pylib'))
from common import util
CHROME_26_REVISION = '181664'
CHROME_27_REVISION = '190466'
_SITE = 'http://commondatastorage.googleapis.com/chromium-browser-continuous'
......
......@@ -96,6 +96,12 @@ def main():
parser.add_option(
'', '--android-package',
help='Application package name, if running tests on Android.')
# Option 'chrome-version' is for desktop only.
parser.add_option(
'', '--chrome-version',
help='Version of chrome, e.g., \'HEAD\', \'27\', or \'26\'.'
'Default is to run tests against all of these versions.'
'Notice: this option only applies to desktop.')
options, _ = parser.parse_args()
chromedriver_map = {
......@@ -149,12 +155,18 @@ def main():
chrome_26 = continuous_archive.DownloadChrome(
continuous_archive.CHROME_26_REVISION, util.MakeTempDir())
chrome_27 = continuous_archive.DownloadChrome(
continuous_archive.CHROME_27_REVISION, util.MakeTempDir())
chrome_path_versions = [
{'path': chrome_tip_of_tree, 'version': 'HEAD'},
{'path': chrome_27, 'version': '27'},
{'path': chrome_26, 'version': '26'},
]
code = 0
for chrome in chrome_path_versions:
if options.chrome_version and chrome['version'] != options.chrome_version:
continue
code1 = RunPythonTests(chromedriver, chrome=chrome['path'],
chrome_version=chrome['version'])
code2 = RunJavaTests(chromedriver_server, chrome=chrome['path'],
......
......@@ -62,6 +62,9 @@ _DESKTOP_NEGATIVE_FILTER['HEAD'] = (
'ChromeDriverTest.testAlert',
]
)
_DESKTOP_NEGATIVE_FILTER['27'] = (
_DESKTOP_NEGATIVE_FILTER['HEAD'] + []
)
_DESKTOP_NEGATIVE_FILTER['26'] = (
_DESKTOP_NEGATIVE_FILTER['HEAD'] + []
)
......
......@@ -95,6 +95,7 @@ _REVISION_NEGATIVE_FILTER['HEAD'] = [
'WebElementTest.testElementReturnsOriginDriver',
'WindowTest.*',
]
_REVISION_NEGATIVE_FILTER['27'] = [] + _REVISION_NEGATIVE_FILTER['HEAD']
_REVISION_NEGATIVE_FILTER['26'] = [
'UploadTest.testFileUploading',
'CorrectEventFiringTest.testUploadingFileShouldFireOnChangeEvent',
......@@ -107,6 +108,8 @@ _OS_NEGATIVE_FILTER = {}
_OS_NEGATIVE_FILTER['win'] = [
# https://code.google.com/p/chromedriver/issues/detail?id=282
'PageLoadingTest.testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCall',
# https://code.google.com/p/chromedriver/issues/detail?id=303
'CombinedInputActionsTest.testChordControlCutAndPaste',
]
_OS_NEGATIVE_FILTER['linux'] = [
# https://code.google.com/p/chromedriver/issues/detail?id=284
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment