diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-30 17:46:52 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-30 17:46:52 +0200 |
| commit | 50a68a565252b47ce241651b33a2d35f1898ebf4 (patch) | |
| tree | 6ed7f49db08c6d4c11921f83fecabbc2a981e321 | |
| parent | 0bc345be0bd6a61a6f3b5657057a07ca4f9622b1 (diff) | |
| download | psutil-50a68a565252b47ce241651b33a2d35f1898ebf4.tar.gz | |
#1098: raise TimeoutExpired also if timeout param is passed
| -rw-r--r-- | psutil/_pswindows.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py index ff868f2e..52676183 100644 --- a/psutil/_pswindows.py +++ b/psutil/_pswindows.py @@ -795,8 +795,11 @@ class Process(object): ret = cext.proc_wait(self.pid, cext_timeout) if ret == WAIT_TIMEOUT: raise TimeoutExpired(timeout, self.pid, self._name) - if timeout is None and pid_exists(self.pid): - continue + if pid_exists(self.pid): + if timeout is None: + continue + else: + raise TimeoutExpired(timeout, self.pid, self._name) return ret @wrap_exceptions |