Chromium Code Reviews| Index: chrome/test/mini_installer/chrome_helper.py |
| diff --git a/chrome/test/mini_installer/chrome_helper.py b/chrome/test/mini_installer/chrome_helper.py |
| index 00e892ab040957417846f4cf6bea6fc784488efc..e507723318def9f5a5d22ba56616a8c1719a5ec0 100644 |
| --- a/chrome/test/mini_installer/chrome_helper.py |
| +++ b/chrome/test/mini_installer/chrome_helper.py |
| @@ -4,14 +4,39 @@ |
| """Common helper module for working with Chrome's processes and windows.""" |
| -import psutil |
| +import ctypes |
| +import pywintypes |
| import re |
| +import win32con |
| import win32gui |
| import win32process |
| import path_resolver |
| +def GetProcessIDAndPathPairs(): |
| + """Returns a list of 2-tuples of (process id, process path). |
| + |
| + This is needed because psutil is not available on Windows slave machines (see |
| + https://code.google.com/p/chromium/issues/detail?id=257696). When it becomes |
|
Mathieu
2013/08/30 19:34:10
How about:
This is needed because psutil is not a
sukolsak
2013/08/30 20:06:07
Done.
|
| + available, we can use psutil.process_iter() instead. |
| + """ |
| + process_id_and_path_pairs = [] |
| + for process_id in win32process.EnumProcesses(): |
| + process_handle = ctypes.windll.kernel32.OpenProcess( |
|
Mathieu
2013/08/30 19:34:10
Make sure this never produces an exception
sukolsak
2013/08/30 20:06:07
OpenProcess doesn't produce an exception. It retur
Mathieu
2013/08/30 20:11:15
Do you mean None or the string 'NULL'? Verify that
sukolsak
2013/08/30 20:22:02
Sorry, I mean 0 (int). I have verified it with "pr
|
| + win32con.PROCESS_QUERY_INFORMATION | win32con.PROCESS_VM_READ, False, |
| + process_id) |
| + if not process_handle: |
| + continue |
| + try: |
| + process_path = win32process.GetModuleFileNameEx(process_handle, 0) |
| + process_id_and_path_pairs.append((process_id, process_path)) |
| + except pywintypes.error: |
| + # It's normal that some processes are not accessible. |
| + pass |
| + return process_id_and_path_pairs |
| + |
| + |
| def GetProcessIDs(process_path): |
| """Returns a list of IDs of processes whose path is |process_path|. |
| @@ -22,14 +47,9 @@ def GetProcessIDs(process_path): |
| A list of process IDs. |
| """ |
| process_ids = [] |
| - for process in psutil.process_iter(): |
| - try: |
| - found_process_path = process.exe |
| - if found_process_path == process_path: |
| - process_ids.append(process.pid) |
| - except psutil.AccessDenied: |
| - # It's normal that some processes are not accessible. |
| - pass |
| + for found_process_id, found_process_path in GetProcessIDAndPathPairs(): |
| + if found_process_path == process_path: |
| + process_ids.append(found_process_id) |
| return process_ids |
|
Mathieu
2013/08/30 19:34:10
How about:
return [pid for (pid, path) in GetProce
sukolsak
2013/08/30 20:06:07
Done.
|