summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 00:15:23 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 00:15:23 +0000
commit518c1efc046a2df03a1da0aab542a384e201f8d2 (patch)
treecaf7f2a41762c4b68c66e7fa06bfacee343dec3f /chrome/test/functional
parent0352e547cf2ba8ed345651e1ec8cdb1359425bc0 (diff)
downloadchromium_src-518c1efc046a2df03a1da0aab542a384e201f8d2.zip
chromium_src-518c1efc046a2df03a1da0aab542a384e201f8d2.tar.gz
chromium_src-518c1efc046a2df03a1da0aab542a384e201f8d2.tar.bz2
Fix testInvalidURLNoHistory to account for proxy invalid url page.
Proxy servers can show up a page for invalid URLs. This does go in history, and so that test fails. Use file:// urls only. Review URL: http://codereview.chromium.org/1745020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/history.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/test/functional/history.py b/chrome/test/functional/history.py
index 052fe79..ec25ce6 100644
--- a/chrome/test/functional/history.py
+++ b/chrome/test/functional/history.py
@@ -56,11 +56,13 @@ class HistoryTest(pyauto.PyUITest):
"""Invalid URLs should not go in history."""
assert not self.GetHistoryInfo().History(), 'Expecting clean history.'
urls = [ self.GetFileURLForPath('some_non-existing_path'),
- 'http://a.nonexisting.domain.blah',
- 'ftp://this.should.not.exist/file',
+ self.GetFileURLForPath('another_non-existing_path'),
]
for url in urls:
- self.NavigateToURL(url)
+ if not url.startswith('file://'):
+ logging.warn('Using %s. Might depend on how dns failures are handled'
+ 'on the network' % url)
+ self.NavigateToURL(url)
self.assertEqual(0, len(self.GetHistoryInfo().History()))
def testNewTabNoHistory(self):