Fix for testcase

ptrlib/connection/proc.py

@@ -136,6 +136,10 @@ def __init__(self,
     @property
     def returncode(self) -> Optional[int]:
         return self._returncode
+
+    @property
+    def pid(self) -> int:
+        return self._proc.pid
 
     #
     # Implementation of Tube methods

ptrlib/connection/tube.py

@@ -19,16 +19,6 @@ def decorator(self, *args, **kwargs):
         return method(self, *args, **kwargs)
     return decorator
 
-def tube_is_alive(method):
-    """Ensure that connection is not *implicitly* closed
-    """
-    def decorator(self, *args, **kwargs):
-        assert isinstance(self, Tube), "Invalid usage of decorator"
-        if not self.is_alive():
-            raise BrokenPipeError("Connection has already been closed by {str(args[0])}")
-        return method(self, *args, **kwargs)
-    return decorator
-
 def tube_is_send_open(method):
     """Ensure that sender connection is not explicitly closed
     """
@@ -746,6 +736,8 @@ def is_alive(self) -> bool:
                 print(tube.recv())
             ```
         """
+        if self._is_closed:
+            return False
         return self._is_alive_impl()
 
     def shutdown(self, target: Literal['send', 'recv']):

ptrlib/connection/winproc.py

@@ -187,8 +187,21 @@ def __init__(self,
         win32pipe.ConnectNamedPipe(self._stdout.handle)
         win32pipe.ConnectNamedPipe(self._stderr.handle)
 
+        self._returncode = None
+
         logger.info(f"Successfully created new process {str(self)}")
 
+    #
+    # Property
+    #
+    @property
+    def returncode(self) -> Optional[int]:
+        return self._returncode
+
+    @property
+    def pid(self) -> int:
+        return self._pid
+
     #
     # Implementation of Tube
     #
@@ -266,17 +279,21 @@ def _is_alive_impl(self) -> bool:
             bool: True if process is alive, otherwise False
         """
         status = win32process.GetExitCodeProcess(self._proc)
-        return status == win32con.STILL_ACTIVE
+        if status == win32con.STILL_ACTIVE:
+            return True
+        else:
+            self._returncode = status
+            return False
 
     def _shutdown_recv_impl(self):
         """Kill receiver connection
         """
-        self._stdin.close()
+        self._stdout.close()
 
     def _shutdown_send_impl(self):
         """Kill sender connection
         """
-        self._stdout.close()
+        self._stdin.close()
 
     def __str__(self) -> str:
         return f'{self._filepath} (PID={self._pid})'

tests/connection/test_windows_proc.py

@@ -27,7 +27,7 @@ def test_basic(self):
         with self.assertLogs(module_name) as cm:
             p = Process("./tests/test.bin/test_echo.pe.exe")
         self.assertEqual(len(cm.output), 1)
-        self.assertRegex(cm.output[0], fr'^INFO:{module_name}:Successfully created new process \(PID=\d+\)$')
+        self.assertEqual(cm.output[0], f'INFO:{module_name}:Successfully created new process {str(p)}')
         pid = p.pid
 
         # send / recv
@@ -58,7 +58,7 @@ def test_timeout(self):
         with self.assertLogs(module_name) as cm:
             p = Process("./tests/test.bin/test_echo.pe.exe")
         self.assertEqual(len(cm.output), 1)
-        self.assertRegex(cm.output[0], fr'^INFO:{module_name}:Successfully created new process \(PID=\d+\)$')
+        self.assertEqual(cm.output[0], f'INFO:{module_name}:Successfully created new process {str(p)}')
 
         with self.assertRaises(TimeoutError):
             p.recvuntil("*** never expected ***", timeout=1)