Final set of conversions of automation calls to the JSON interface.

chrome/test/functional/bookmarks.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Must import this first
 import pyauto_functional
 
 import logging
 import os
 import sys
 import unittest
 
 import pyauto
 
 
 class BookmarksTest(pyauto.PyUITest):
   """Test of bookmarks."""
 
+  def setUp(self):
+    pyauto.PyUITest.setUp(self)
+    self.WaitForBookmarkModelToLoad()

[Nirnimesh, 2012/08/10 04:34:20]

how was this working before?

[craigdh, 2012/08/10 18:08:04]

I have that same question. Previously the calls just failed silently if the
BookMark model wasn't loaded. Once they raised exceptions the tests didn't pass.

I haven't dug too deeply into it since they pass correctly now.

+
   def testBasics(self):
     """Basic tests with an empty bookmark model."""
     bookmarks = self.GetBookmarkModel()
     # Make sure we have the two root nodes and that they are empty
     for node in (bookmarks.BookmarkBar(), bookmarks.Other()):
       self.assertEqual(node['type'], 'folder')
       self.assertFalse(node['children'])
 
   def testAddOneNode(self):
     """Add a bookmark to the bar; confirm it."""
@@ skipping 663 matching lines @@
     self.assertEqual(0, len(node))
     # Search 'DB' in profile 1.
     self.OpenProfileWindow(path=profile2_path)
     bookmarks = self.GetBookmarkModel(windex=2)
     node = bookmarks.FindByTitle('GoogleNews')
     self.assertEqual(0, len(node))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()