summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvenkataramana@chromium.org <venkataramana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 22:59:31 +0000
committervenkataramana@chromium.org <venkataramana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 22:59:31 +0000
commit80c36e207822e61b3afb6857eb3f60576f157f16 (patch)
treeca6644e6c8caf979bda3af579efa788090bcca9f
parentaecb6caa6177e69648acc0ebe682283acb469cea (diff)
downloadchromium_src-80c36e207822e61b3afb6857eb3f60576f157f16.zip
chromium_src-80c36e207822e61b3afb6857eb3f60576f157f16.tar.gz
chromium_src-80c36e207822e61b3afb6857eb3f60576f157f16.tar.bz2
To fix the failing prefs test: prefs.PrefsTest.testNavigationStateOnSessionRestore
BUG=85600 Test=prefs.PrefsTest.testNavigationStateOnSessionRestore Review URL: http://codereview.chromium.org/7537004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94783 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/functional/PYAUTO_TESTS2
-rw-r--r--chrome/test/functional/prefs.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 4a0b224..d2697ac 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -100,8 +100,6 @@
'-popups.PopupsTest.testBlockedPopupNotShowInHistory',
# Crashes browser. crbug.com/89000
'-prefs.PrefsTest.testGeolocationPref',
- # crbug.com/85600
- '-prefs.PrefsTest.testNavigationStateOnSessionRestore',
# Flaky: crbug.com/67851
'-special_tabs.SpecialTabsTest.testAboutDNSTab',
# crbug.com/86523
diff --git a/chrome/test/functional/prefs.py b/chrome/test/functional/prefs.py
index 6ac9dce..c400a5d 100644
--- a/chrome/test/functional/prefs.py
+++ b/chrome/test/functional/prefs.py
@@ -48,8 +48,8 @@ class PrefsTest(pyauto.PyUITest):
def testNavigationStateOnSessionRestore(self):
"""Verify navigation state is preserved on session restore."""
urls = ('http://www.google.com/',
- 'http://news.google.com/',
- 'http://dev.chromium.org/',)
+ 'https://encrypted.google.com/',
+ 'http://www.google.com/chrome',)
for url in urls:
self.NavigateToURL(url)
tab = self.GetBrowserWindow(0).GetTab(0)