summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 01:09:33 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 01:09:33 +0000
commit6617e987f5fc31d537c04def5a43dbf7a9749b8b (patch)
tree9b0ac643f69f30fc46f6c60dee34b426f5843b66 /chrome/test/functional
parentc34f6448c271ff31d2a63b11daa798a4c79b091c (diff)
downloadchromium_src-6617e987f5fc31d537c04def5a43dbf7a9749b8b.zip
chromium_src-6617e987f5fc31d537c04def5a43dbf7a9749b8b.tar.gz
chromium_src-6617e987f5fc31d537c04def5a43dbf7a9749b8b.tar.bz2
Fix a plugins test
Need to wait long enough for plugin process to get created after killing it. Review URL: http://codereview.chromium.org/5999011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/plugins.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/functional/plugins.py b/chrome/test/functional/plugins.py
index 7457ce8..9e52eb7 100644
--- a/chrome/test/functional/plugins.py
+++ b/chrome/test/functional/plugins.py
@@ -100,11 +100,11 @@ class PluginsTest(pyauto.PyUITest):
lambda: self._GetPluginPID(plugin_name) is None),
msg='Expected %s plugin to die after killing' % plugin_name)
self.GetBrowserWindow(0).GetTab(0).Reload()
- pid_reload = self._GetPluginPID(plugin_name)
- self.assertTrue(pid_reload,
- 'No plugin process for %s after reloading' % plugin_name)
+ self.assertTrue(self.WaitUntil(
+ lambda: self._GetPluginPID(plugin_name)),
+ msg='No plugin process for %s after reloading' % plugin_name)
# Verify that it's in fact a new process.
- self.assertNotEqual(pid, pid_reload,
+ self.assertNotEqual(pid, self._GetPluginPID(plugin_name),
'Did not get new pid for %s after reloading' %
plugin_name)