From 54d3d3b4d4d2638d0e654fa4f3a39c50c341d971 Mon Sep 17 00:00:00 2001 From: Ogulcan Celik Date: Wed, 20 May 2026 23:08:47 +0300 Subject: test: close pty masters before waiting --- tests/server_headless.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests/server_headless.rs') diff --git a/tests/server_headless.rs b/tests/server_headless.rs index 99f72404..8f0234f0 100644 --- a/tests/server_headless.rs +++ b/tests/server_headless.rs @@ -29,14 +29,21 @@ fn unique_test_dir() -> PathBuf { } struct SpawnedHerdr { - _master: Box, + _master: Option>, child: Box, } +impl SpawnedHerdr { + fn close_master(&mut self) { + drop(self._master.take()); + } +} + impl Drop for SpawnedHerdr { fn drop(&mut self) { let pid = self.child.process_id(); let _ = self.child.kill(); + self.close_master(); if let Some(pid) = pid { let deadline = Instant::now() + Duration::from_secs(2); @@ -127,7 +134,7 @@ fn spawn_server( drop(pair.slave); SpawnedHerdr { - _master: pair.master, + _master: Some(pair.master), child, } } @@ -440,6 +447,7 @@ fn server_removes_client_socket_on_exit() { // Kill the server. let _ = spawned.child.kill(); + spawned.close_master(); let _ = spawned.child.wait(); // Give it a moment to clean up. -- cgit v1.2.3