diff options
| author | samuong <samuong@chromium.org> | 2015-07-29 14:11:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-29 21:11:49 +0000 |
| commit | 46155b242dc2d31f7fcf699d3b93a9e2781492c7 (patch) | |
| tree | 81dfadd12d5ec3232d3eb66b7ee6b0c5c4623d88 | |
| parent | f2fee6f797514f59269ede88590b3e4ab716d988 (diff) | |
| download | chromium_src-46155b242dc2d31f7fcf699d3b93a9e2781492c7.zip chromium_src-46155b242dc2d31f7fcf699d3b93a9e2781492c7.tar.gz chromium_src-46155b242dc2d31f7fcf699d3b93a9e2781492c7.tar.bz2 | |
[chromedriver] Fix broken testConsoleLogSources test and disable testWaitsForExtensionToLoad.
BUG=chromedriver:1167
Review URL: https://codereview.chromium.org/1266523003
Cr-Commit-Position: refs/heads/master@{#340985}
| -rwxr-xr-x | chrome/test/chromedriver/test/run_py_tests.py | 11 | ||||
| -rw-r--r-- | chrome/test/data/chromedriver/console_log.html | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py index f3241c6..3748731 100755 --- a/chrome/test/chromedriver/test/run_py_tests.py +++ b/chrome/test/chromedriver/test/run_py_tests.py @@ -57,6 +57,7 @@ _NEGATIVE_FILTER = [ 'ChromeDriverTest.testTouchPinch', # https://code.google.com/p/chromedriver/issues/detail?id=1167 'ChromeDriverTest.testShouldHandleNewWindowLoadingProperly', + 'ChromeExtensionsCapabilityTest.testWaitsForExtensionToLoad', ] _VERSION_SPECIFIC_FILTER = {} @@ -721,12 +722,12 @@ class ChromeDriverTest(ChromeDriverBaseTest): self._driver.Load(self.GetHttpUrlForFile('/chromedriver/console_log.html')) logs = self._driver.GetLog('browser') - self.assertEqual('network', logs[0]['source']) - self.assertTrue('nonexistent.png' in logs[0]['message']) - self.assertTrue('404' in logs[0]['message']) + self.assertEqual('javascript', logs[0]['source']) + self.assertTrue('TypeError' in logs[0]['message']) - self.assertEqual('javascript', logs[1]['source']) - self.assertTrue('TypeError' in logs[1]['message']) + self.assertEqual('network', logs[1]['source']) + self.assertTrue('nonexistent.png' in logs[1]['message']) + self.assertTrue('404' in logs[1]['message']) # Sometimes, we also get an error for a missing favicon. if len(logs) > 2: diff --git a/chrome/test/data/chromedriver/console_log.html b/chrome/test/data/chromedriver/console_log.html index 1387c7e..e3bb9fe 100644 --- a/chrome/test/data/chromedriver/console_log.html +++ b/chrome/test/data/chromedriver/console_log.html @@ -1,13 +1,9 @@ <!DOCTYPE html> <html> - <head> + <body> <script> - function onLoad() { - var x = document.nonexistent.y; - } + var x = document.nonexistent.y; </script> - </head> - <body onload="onLoad()"> <img src="/chromedriver/nonexistent.png"> </body> </html> |