fixup tests

Signed-off-by: Matej Hrica <[email protected]>

Author: mtjhrc

tests/test_cases/src/test_multiport_console.rs

@@ -30,11 +30,11 @@ mod host {
         });
     }
 
-    fn add_console_port(
+    fn test_port(
         ctx: u32,
         console_id: u32,
         name: &str,
-    ) -> anyhow::Result<(UnixStream, UnixStream)> {
+    ) -> anyhow::Result<()> {
         let (guest, host) = UnixStream::pair()?;
         let name_cstring = CString::new(name)?;
         unsafe {
@@ -46,7 +46,9 @@ mod host {
                 guest.as_raw_fd()
             ))?;
         }
-        Ok((guest, host))
+        mem::forget(guest);
+        spawn_ping_pong_responder(host);
+        Ok(())
     }
 
     impl Test for TestMultiportConsole {
@@ -55,36 +57,22 @@ mod host {
                 krun_call!(krun_set_log_level(KRUN_LOG_LEVEL_WARN))?;
                 let ctx = krun_call_u32!(krun_create_ctx())?;
 
-                // Disable implicit console
                 krun_call!(krun_disable_implicit_console(ctx))?;
 
-                // Add a default console with STDIN/STDOUT/STDERR
+                // Add a default console (as with other tests this uses stdout for writing "OK")
                 krun_call!(krun_add_virtio_console_default(
                     ctx,
-                    std::io::stdin().as_raw_fd(),
+                    -1,
                     std::io::stdout().as_raw_fd(),
-                    std::io::stderr().as_raw_fd()
+                    -1,
                 ))?;
 
-                // Create a multiport console
                 let console_id = krun_call_u32!(krun_add_virtio_console_multiport(ctx))?;
 
-                // Add 3 inout ports with different names
-                let (port1_guest, port1_host) =
-                    add_console_port(ctx, console_id, "test-port-alpha")?;
-                let (port2_guest, port2_host) =
-                    add_console_port(ctx, console_id, "test-port-beta")?;
-                let (port3_guest, port3_host) =
-                    add_console_port(ctx, console_id, "test-port-gamma")?;
+                test_port(ctx, console_id, "test-port-alpha")?;
+                test_port(ctx, console_id, "test-port-beta")?;
+                test_port(ctx, console_id, "test-port-gamma")?;
 
-                spawn_ping_pong_responder(port1_host);
-                spawn_ping_pong_responder(port2_host);
-                spawn_ping_pong_responder(port3_host);
-
-                // Keep the guest-side streams open for the VM
-                mem::forget(port1_guest);
-                mem::forget(port2_guest);
-                mem::forget(port3_guest);
 
                 krun_call!(krun_set_vm_config(ctx, 1, 1024))?;
                 setup_fs_and_enter(ctx, test_setup)?;
@@ -116,13 +104,12 @@ mod guest {
         let mut response = String::new();
         reader.read_line(&mut response).unwrap();
 
-        let expected = message.replace("PING", "PONG").trim().to_string();
-        assert_eq!(response.trim(), expected, "{}: wrong response", name);
+        let expected = message.replace("PING", "PONG").to_string();
+        assert_eq!(response, expected, "{}: wrong response", name);
     }
 
     impl Test for TestMultiportConsole {
         fn in_guest(self: Box<Self>) {
-            // List all virtio ports to find our named ports
             let ports_dir = "/sys/class/virtio-ports";
 
             let mut port_map = std::collections::HashMap::new();
@@ -144,7 +131,10 @@ mod guest {
                 }
             }
 
-            // Verify we have all three ports
+            assert!(
+                port_map.contains_key("krun-stdout"),
+                "krun-stdout not found"
+            );
             assert!(
                 port_map.contains_key("test-port-alpha"),
                 "test-port-alpha not found"
@@ -158,6 +148,9 @@ mod guest {
                 "test-port-gamma not found"
             );
 
+            // We shouldn't have any more than configured here
+            assert_eq!(port_map.len(), 4);
+
             test_port(&port_map, "test-port-alpha", "PING-ALPHA\n");
             test_port(&port_map, "test-port-beta", "PING-BETA\n");
             test_port(&port_map, "test-port-gamma", "PING-GAMMA\n");