summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authordyu@chromium.org <dyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 01:53:26 +0000
committerdyu@chromium.org <dyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 01:53:26 +0000
commitc9fedd8a0498fd75afd4dea178ef830b3b3534e9 (patch)
tree23222528bac59bddd38555ac7b4b5d22ebfa0242 /chrome/test/functional
parent6e80682cbe874c97bb64e9a2f42cb423bb0063a7 (diff)
downloadchromium_src-c9fedd8a0498fd75afd4dea178ef830b3b3534e9.zip
chromium_src-c9fedd8a0498fd75afd4dea178ef830b3b3534e9.tar.gz
chromium_src-c9fedd8a0498fd75afd4dea178ef830b3b3534e9.tar.bz2
Fix testAboutAppCacheTab by replacing External 500 error URL to working URL.
BUG=102517 TEST=none Review URL: http://codereview.chromium.org/8533018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/PYAUTO_TESTS2
-rw-r--r--chrome/test/functional/special_tabs.py8
2 files changed, 2 insertions, 8 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 5b939da..48f4665 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -113,8 +113,6 @@
'-search_engines.SearchEnginesTest.testDefaultSearchEngines',
# Flaky: crbug.com/67851
'-special_tabs.SpecialTabsTest.testAboutDNSTab',
- # crbug.com/102517 -- external webpage throws 500
- '-special_tabs.SpecialTabsTest.testAboutAppCacheTab',
# crbug.com/95140
'-translate.TranslateTest.testGoBackAndForwardToTranslatePage',
# crbug.com/86524
diff --git a/chrome/test/functional/special_tabs.py b/chrome/test/functional/special_tabs.py
index 6e2ec9d..b9770f3 100644
--- a/chrome/test/functional/special_tabs.py
+++ b/chrome/test/functional/special_tabs.py
@@ -198,16 +198,12 @@ class SpecialTabsTest(pyauto.PyUITest):
"""Confirm about:appcache-internals contains expected content for Caches.
Also confirms that the about page populates Application Caches."""
# Navigate to html page to activate DNS prefetching.
- self.NavigateToURL('http://static.webvm.net/appcache-test/simple.html')
- # Wait for page to load and display sucess or fail message.
- self.WaitUntil(
- lambda: self.GetDOMValue('document.getElementById("result").innerHTML'),
- expect_retval='SUCCESS')
+ self.NavigateToURL('http://www.webkit.org/demos/sticky-notes/index.html')
self.GetBrowserWindow(0).GetTab(0).GoBack()
test_utils.StringContentCheck(
self, self.GetTabContents(),
['Manifest',
- 'http://static.webvm.net/appcache-test/resources/simple.manifest'],
+ 'http://www.webkit.org/demos/sticky-notes/StickyNotes.manifest'],
[])
def _VerifyAboutDNS(self):