Adding more verifications to recenthistorypage test

functional/omnibox.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob
 import os
 import re
 import shutil
 import tempfile
@@ skipping 289 matching lines @@
     old_matches = self._GetOmniboxMatchesFor(search_text)
     url = self.GetFileURLForPath(
         os.path.join(self.DataDir(), 'find_in_page', 'largepage.html'))
     self.AppendTab(pyauto.GURL(url))
     self.assertTrue(self.WaitUntil(lambda: self._GotNewMatches(len(old_matches),
                                    search_text), timeout=1))
     matches = self._GetOmniboxMatchesFor(search_text)
     matches_description = [x for x in matches if x['destination_url'] == url]
     self.assertEqual(1, len(matches_description))
 
+  def _verifyOpenHistoryPageOption(self, search_text):

[Nirnimesh, 2011/01/06 02:09:17]

This is a misnomer. Doens't really 'verify'

Rename to: _GetHistoryPageOption

+    """Verify if history page option is available or not in the omnnibox
+       results"""
+    matches = self._GetOmniboxMatchesFor(search_text)
+    matches_description = [x for x in matches if x['type'] ==
+                           'open-history-page']
+    if len(matches_description) == 0:

[Nirnimesh, 2011/01/06 02:09:17]

return len(matches_description) != 0

+      return False
+    return True
+
   def testRecentPageHistory(self):
     """Verify that omnibox shows recent history option in the visited
        url list."""
     search_text = 'file'
     sites = glob.glob(os.path.join(self.DataDir(), 'find_in_page', '*.html'))
     for site in sites:
       self.NavigateToURL(self.GetFileURLForPath(site))
-    old_matches = self._GetOmniboxMatchesFor(search_text)
     # Using max timeout as 120 seconds, since expected page only shows up
     # after > 60 seconds on some machines and default timeout is less than that.
     # TODO (Nirnimesh): design an api using which we can push history changes to
     # omnibox results.
     self.assertTrue(self.WaitUntil(
-        lambda: self._GotNewMatches(len(old_matches), search_text),
+        lambda: self._verifyOpenHistoryPageOption(search_text),
         timeout=120))
-    matches = self._GetOmniboxMatchesFor(search_text)
-    matches_description = [x for x in matches if x['type'] ==
-                           'open-history-page']
-    self.assertEqual(1, len(matches_description))
 
   def _VerifyHasBookmarkResult(self, matches):
     """Verify that we have a bookmark result."""
     matches_starred = [result for result in matches if result['starred']]
     self.assertTrue(matches_starred)
     self.assertEqual(1, len(matches_starred))
 
   def testBookmarkResultInNewTabAndWindow(self):
     """Verify that omnibox can recognize a bookmark within search options
     in new tabs and windows."""
@@ skipping 12 matching lines @@
     self.NavigateToURL(url, 1, 0)
     self._CheckBookmarkResultForVariousInputs(url, title, windex=1)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.assertEqual(3, self.GetBrowserWindowCount())
     self.NavigateToURL(url, 2, 0)
     self._CheckBookmarkResultForVariousInputs(url, title, windex=2)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()