summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-20 03:52:23 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-20 03:52:23 +0000
commit3e6743f1653f2ce96bde0d6e918175963efe01ee (patch)
tree2ad1e7a2a36252b5f11e186ef33f76feda69b715 /chrome/test/functional
parent9e89338a346aa580f1be18e3b7fe7ffa30107b99 (diff)
downloadchromium_src-3e6743f1653f2ce96bde0d6e918175963efe01ee.zip
chromium_src-3e6743f1653f2ce96bde0d6e918175963efe01ee.tar.gz
chromium_src-3e6743f1653f2ce96bde0d6e918175963efe01ee.tar.bz2
Revert 110811 - Fix testAboutAppCacheTab by replacing External 500 error URL to working URL.
I'm reverting because this test is consistently failing on all bots. Remember that it's the committer's responsibility to ensure that his change lands safely. ====================================================================== FAIL: special_tabs.SpecialTabsTest.testAboutAppCacheTab: "Test App Cache tab to confirm about page populates caches." ---------------------------------------------------------------------- Traceback (most recent call last): File "/mnt/data/b/build/slave/Linux__deb_/build/src/chrome/test/functional/special_tabs.py", line 317, in testAboutAppCacheTab self._VerifyAppCacheInternals() File "/mnt/data/b/build/slave/Linux__deb_/build/src/chrome/test/functional/special_tabs.py", line 207, in _VerifyAppCacheInternals []) File "/mnt/data/b/build/slave/Linux__deb_/build/src/chrome/test/functional/test_utils.py", line 232, in StringContentCheck msg='"%s" missing from content.' % s) AssertionError: "Manifest" missing from content. BUG=102517 TEST=none Review URL: http://codereview.chromium.org/8533018 TBR=dyu@chromium.org Review URL: http://codereview.chromium.org/8473011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110855 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, 8 insertions, 2 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 5cec53c..539e9c3 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -110,6 +110,8 @@
'-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 b9770f3..6e2ec9d 100644
--- a/chrome/test/functional/special_tabs.py
+++ b/chrome/test/functional/special_tabs.py
@@ -198,12 +198,16 @@ 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://www.webkit.org/demos/sticky-notes/index.html')
+ 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.GetBrowserWindow(0).GetTab(0).GoBack()
test_utils.StringContentCheck(
self, self.GetTabContents(),
['Manifest',
- 'http://www.webkit.org/demos/sticky-notes/StickyNotes.manifest'],
+ 'http://static.webvm.net/appcache-test/resources/simple.manifest'],
[])
def _VerifyAboutDNS(self):