From 4179a69d03c7079ab0113f25a7f5e99797fe657e Mon Sep 17 00:00:00 2001 From: "nirnimesh@chromium.org" Date: Thu, 3 Nov 2011 04:50:58 +0000 Subject: Fix testFlashLoadsAfterKill Wait for flash process's absence to be noticed by chrome after killing it. BUG=None TEST=None R=dennisjeffrey@chromium.org Review URL: http://codereview.chromium.org/8438060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108428 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/functional/flash.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/chrome/test/functional/flash.py b/chrome/test/functional/flash.py index b2bd56a..d8df26a 100644 --- a/chrome/test/functional/flash.py +++ b/chrome/test/functional/flash.py @@ -68,6 +68,14 @@ class FlashTest(pyauto.PyUITest): self.NavigateToURL(flash_url) flash_process_id1 = self._GetFlashProcessesInfo()[0]['pid'] self.Kill(flash_process_id1) + + def _GotFlashProcess(pid): + flash_processes = self._GetFlashProcessesInfo() + return len(flash_processes) == 1 and flash_processes[0]['pid'] == pid + + self.assertTrue(self.WaitUntil( + lambda: not _GotFlashProcess(flash_process_id1)), + msg='Flash process did not go away after killing.') self.ReloadActiveTab() flash_processes = self._GetFlashProcessesInfo() self.assertEqual(1, len(flash_processes)) -- cgit v1.1