fix restore after capture with optimized file pipes

minrk · Jun 12, 2024 · 36522b8 · 36522b8
1 parent 0be57d9
commit 36522b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/test.py b/test.py
@@ -229,6 +229,9 @@ def test_two_file_pipes(tmpdir):
             assert w.thread is None
             printf("some stdout")
             printf_err("some stderr")
+        # make sure capture stopped
+        printf("after stdout")
+        printf_err("after stderr")
 
     with test_stdout.open() as f:
         assert f.read() == "some stdout\n"

diff --git a/wurlitzer.py b/wurlitzer.py
@@ -209,6 +209,7 @@ def _setup_pipe(self, name):
         real_fd = getattr(sys, '__%s__' % name).fileno()
         save_fd = os.dup(real_fd)
         self._save_fds[name] = save_fd
+        self._real_fds[name] = real_fd
 
         try:
             capture_fd = getattr(self, "_" + name).fileno()
@@ -233,7 +234,6 @@ def _setup_pipe(self, name):
 
         dup2(pipe_in, real_fd)
         os.close(pipe_in)
-        self._real_fds[name] = real_fd
 
         # make pipe_out non-blocking
         flags = fcntl(pipe_out, F_GETFL)