diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 04:50:58 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 04:50:58 +0000 |
| commit | 4179a69d03c7079ab0113f25a7f5e99797fe657e (patch) | |
| tree | be844dbff93572c8da28f79204cd0a8b8f42dadb | |
| parent | afed40644caaaadcf7ada29ea3654f811d4d229c (diff) | |
| download | chromium_src-4179a69d03c7079ab0113f25a7f5e99797fe657e.zip chromium_src-4179a69d03c7079ab0113f25a7f5e99797fe657e.tar.gz chromium_src-4179a69d03c7079ab0113f25a7f5e99797fe657e.tar.bz2 | |
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
| -rw-r--r-- | chrome/test/functional/flash.py | 8 |
1 files changed, 8 insertions, 0 deletions
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)) |