Fixing pyauto plugins test...

functional/plugins.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 logging
 import os
 import re
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 174 matching lines @@
 
   def testBlockPluginException(self):
     """Verify that plugins can be blocked on a domain by adding
     an exception(s)."""
     # We are using the same live site in order to detect if the web page
     # is using shockwave flash process.
     # On few test machines navigation takes more than the default time so
     # setting 1 min of wait time here.
     test_utils.CallFunctionWithNewTimeout(self, 1 * 60 * 1000,
         lambda: self.NavigateToURL('http://vimeo.com'))
-    pid = self._GetPluginPID('Shockwave Flash')
-    self.assertTrue(pid, msg='No plugin process for Shockwave Flash')
-    self.Kill(pid)
+    # Wait until Shockwave Flash plugin process loads.
+    self.assertTrue(self.WaitUntil(
+        lambda: self._GetPluginPID('Shockwave Flash') is not None),
+        msg='No plugin process for Shockwave Flash')
+    self.Kill(self._GetPluginPID('Shockwave Flash'))
     self.assertTrue(self.WaitUntil(
         lambda: self._GetPluginPID('Shockwave Flash') is None),
         msg='Expected Shockwave Flash plugin to die after killing')
 
-    # Add an exception to block plugins on hulu.com.
+    # Add an exception to block plugins on vimeo.com.
     self.SetPrefs(pyauto.kContentSettingsPatterns,
                  {'[*.]vimeo.com': {'plugins': 2}})
     self.GetBrowserWindow(0).GetTab(0).Reload()
     self.assertFalse(self._GetPluginPID('Shockwave Flash'),
-                     msg='Plug-in not blocked.')
+                     msg='Shockwave Flash Plug-in not blocked.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()