summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsamuong@chromium.org <samuong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 07:44:10 +0000
committersamuong@chromium.org <samuong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 07:44:10 +0000
commitf0938d1e15514d060fde1acdc96124aa58f9f296 (patch)
tree3c434de0423251c413ca1ecd3e30da95d1ff383c
parent212464049e359ac258f9306718aa708cdf4fd0fd (diff)
downloadchromium_src-f0938d1e15514d060fde1acdc96124aa58f9f296.zip
chromium_src-f0938d1e15514d060fde1acdc96124aa58f9f296.tar.gz
chromium_src-f0938d1e15514d060fde1acdc96124aa58f9f296.tar.bz2
[chromedriver] Allow testing using newer versions than what Omaha reports
BUG= Review URL: https://codereview.chromium.org/442493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287481 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/test/chromedriver/test/run_py_tests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py
index 33a7319..71b225a 100755
--- a/chrome/test/chromedriver/test/run_py_tests.py
+++ b/chrome/test/chromedriver/test/run_py_tests.py
@@ -735,8 +735,9 @@ class ChromeDriverAndroidTest(ChromeDriverBaseTest):
for v in l['versions']:
if (('stable' in v['channel'] and 'stable' in _ANDROID_PACKAGE_KEY) or
('beta' in v['channel'] and 'beta' in _ANDROID_PACKAGE_KEY)):
- self.assertEquals(v['version'],
- self._driver.capabilities['version'])
+ omaha = map(int, v['version'].split('.'))
+ device = map(int, self._driver.capabilities['version'].split('.'))
+ self.assertTrue(omaha <= device)
return
raise RuntimeError('Malformed omaha JSON')
except urllib2.URLError as e: