diff options
| author | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 19:41:47 +0000 |
|---|---|---|
| committer | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 19:41:47 +0000 |
| commit | fec4982b184d979bd896d7791733327f767e80b6 (patch) | |
| tree | f0e53669cfd750a4839ffb81042a77251dde1e86 /chrome/test/functional/history.py | |
| parent | 7cadaf42d347bee1fa653233e9108e3399227e3b (diff) | |
| download | chromium_src-fec4982b184d979bd896d7791733327f767e80b6.zip chromium_src-fec4982b184d979bd896d7791733327f767e80b6.tar.gz chromium_src-fec4982b184d979bd896d7791733327f767e80b6.tar.bz2 | |
Revise history pyauto test to account for UI change.
When the history page loads, its tab title is temporarily "Loading..."
until the page finishes loading all content. This required a minor change
to a history test to account for that fact.
BUG=120043
TEST=Verified that the test used to fail, but now passes with these changes
using --repeat=5 on my local linux machine.
Review URL: https://chromiumcodereview.appspot.com/9855002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional/history.py')
| -rwxr-xr-x | chrome/test/functional/history.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/test/functional/history.py b/chrome/test/functional/history.py index 31788bf..34d640a 100755 --- a/chrome/test/functional/history.py +++ b/chrome/test/functional/history.py @@ -327,12 +327,15 @@ class HistoryTest(pyauto.PyUITest): Also, make sure that existing history tab is activated. """ command_line = self.GetBrowserInfo()['properties']['command_line_string'] - history_url = 'chrome://history-frame/' + history_url = 'chrome://chrome/history' # Invoke History. self.RunCommand(pyauto.IDC_SHOW_HISTORY) - self.assertEqual('History', self.GetActiveTabTitle(), - msg='History page was not opened.') + # Even when the above command completes, the currently-active tab title + # is 'Loading...' for a brief time while the history page loads. + self.assertTrue( + self.WaitUntil(lambda: 'History' == self.GetActiveTabTitle()), + msg='History page was not opened.') # Open new tab, invoke History again. self.RunCommand(pyauto.IDC_NEW_TAB) |