[gnome-settings-daemon/benzea/tests-output-checker] fixup! tests: Add new OutputChecker class
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/benzea/tests-output-checker] fixup! tests: Add new OutputChecker class
- Date: Mon, 15 Feb 2021 11:59:20 +0000 (UTC)
commit b16c355c004c9b749d237c9d415575ffcf467909
Author: Benjamin Berg <bberg redhat com>
Date: Mon Feb 15 12:59:00 2021 +0100
fixup! tests: Add new OutputChecker class
tests/output_checker.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tests/output_checker.py b/tests/output_checker.py
index 4bf93d82..334be83d 100644
--- a/tests/output_checker.py
+++ b/tests/output_checker.py
@@ -46,8 +46,12 @@ class OutputChecker(object):
def _copy(self):
while True:
- r = os.read(self._pipe_fd_r, 1024)
- if not r:
+ try:
+ r = os.read(self._pipe_fd_r, 1024)
+ if not r:
+ return
+ except OSError:
+ # We get a bad file descriptor error when the outside closes the FD
return
l = r.split(b'\n')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]