[gnome-settings-daemon/benzea/tests-output-checker-testing] tests: try closing writer later

[Benjamin Berg <bberg src gnome org>]

commit 4c994e0e42d91d6a5893678785acf8eaf277466a
Author: Benjamin Berg <bberg redhat com>
Date:   Mon Feb 15 15:15:40 2021 +0100

    tests: try closing writer later

 tests/output_checker.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/tests/output_checker.py b/tests/output_checker.py
index 54b3aa70..040fa4ce 100644
--- a/tests/output_checker.py
+++ b/tests/output_checker.py
@@ -139,13 +139,28 @@ class OutputChecker(object):
         return ret
 
     def assert_closed(self, timeout=1):
+        fd = self._pipe_fd_w
+        self._pipe_fd_w = -1
+        os.close(fd)
+
         self._thread.join(timeout)
+
         if self._thread.is_alive() != False:
             raise AssertionError("OutputCheck: Write side has not been closed yet!")
 
     def force_close(self):
         os.write(1, b"force closing pipe %d" % self._pipe_fd_r);
-        os.close(self._pipe_fd_r)
+
+        fd = self._pipe_fd_r
+        self._pipe_fd_r = -1
+        os.close(fd)
+
+        # Write EOF
+        fd = self._pipe_fd_w
+        os.write(fd, b"")
+        self._pipe_fd_w = -1
+        os.close(fd)
+
         os.write(1, b"pipe closed, waiting\n");
         self._thread.join()
         os.write(1, b"reader thread joined\n");
@@ -155,6 +170,5 @@ class OutputChecker(object):
         return self._pipe_fd_w
 
     def writer_attached(self):
-        os.close(self._pipe_fd_w)
-        self._pipe_fd_w = -1
+        pass