Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport: Added exception handling for OSError that may be thrown by os.read #6017

Open
wants to merge 1 commit into
base: 92lts
Choose a base branch
from
Open

Backport: Added exception handling for OSError that may be thrown by os.read #6017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion avocado/utils/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,10 @@ def _drainer(self):
if not has_io:
# Don't read unless there are new data available
continue
tmp = os.read(self.fd, 8192)
try:
tmp = os.read(self.fd, 8192)
except OSError:
break
if not tmp:
break
self.data.write(tmp)
Expand Down
Loading