DO NOT MERGE: unwrap udp test directly

Author: mkroening

xtask/src/ci/qemu.rs

@@ -119,10 +119,10 @@ impl Qemu {
 			qemu.stdin(Stdio::piped()).stdout(Stdio::piped());
 		}
 
-		let mut qemu = KillChildOnDrop(qemu.spawn().context("Failed to spawn QEMU")?);
+		let mut qemu = KillChildOnDrop(qemu.spawn().context("Failed to spawn QEMU").unwrap());
 
 		thread::sleep(Duration::from_millis(100));
-		if let Some(status) = qemu.0.try_wait()? {
+		if let Some(status) = qemu.0.try_wait().unwrap() {
 			ensure!(
 				self.qemu_success(status, arch),
 				"QEMU exit code: {:?}",
@@ -134,14 +134,14 @@ impl Qemu {
 
 		match image_name {
 			"axum-example" | "http_server" | "http_server_poll" | "http_server_select" => {
-				test_http_server(guest_ip)?
+				test_http_server(guest_ip).unwrap()
 			}
-			"httpd" => test_httpd(guest_ip)?,
-			"testudp" => test_testudp(guest_ip)?,
-			"miotcp" => test_miotcp(guest_ip)?,
-			"mioudp" => test_mioudp(guest_ip)?,
-			"poll" => test_poll(guest_ip)?,
-			"stdin" => test_stdin(&mut qemu.0)?,
+			"httpd" => test_httpd(guest_ip).unwrap(),
+			"testudp" => test_testudp(guest_ip).unwrap(),
+			"miotcp" => test_miotcp(guest_ip).unwrap(),
+			"mioudp" => test_mioudp(guest_ip).unwrap(),
+			"poll" => test_poll(guest_ip).unwrap(),
+			"stdin" => test_stdin(&mut qemu.0).unwrap(),
 			_ => {}
 		}
 
@@ -151,10 +151,10 @@ impl Qemu {
 		) || self.devices.contains(&Device::CadenceGem)
 		// sifive_u, on which we test CadenceGem, does not support software shutdowns, so we have to kill the machine ourselves.
 		{
-			qemu.0.kill()?;
+			qemu.0.kill().unwrap();
 		}
 
-		let status = qemu.0.wait_timeout(Duration::from_secs(60 * 6))?;
+		let status = qemu.0.wait_timeout(Duration::from_secs(60 * 6)).unwrap();
 		let Some(status) = status else {
 			bail!("QEMU timeout")
 		};
@@ -165,12 +165,12 @@ impl Qemu {
 		);
 
 		if let Some(mut virtiofsd) = virtiofsd {
-			let status = virtiofsd.0.wait()?;
+			let status = virtiofsd.0.wait().unwrap();
 			assert!(status.success());
 		}
 
 		if image_name.contains("rftrace") {
-			check_rftrace(image)?;
+			check_rftrace(image).unwrap();
 		}
 
 		Ok(())
@@ -559,9 +559,9 @@ fn test_testudp(guest_ip: IpAddr) -> Result<()> {
 	let buf = "exit";
 	let socket_addr = SocketAddr::new(guest_ip, 9975);
 	eprintln!("[CI] send {buf:?} via UDP to {socket_addr}");
-	let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0))?;
-	socket.connect(socket_addr)?;
-	socket.send(buf.as_bytes())?;
+	let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0)).unwrap();
+	socket.connect(socket_addr).unwrap();
+	socket.send(buf.as_bytes()).unwrap();
 
 	Ok(())
 }
@@ -571,11 +571,11 @@ fn test_miotcp(guest_ip: IpAddr) -> Result<()> {
 	let buf = "exit";
 	let socket_addr = SocketAddr::new(guest_ip, 9975);
 	eprintln!("[CI] send {buf:?} via TCP to {socket_addr}");
-	let mut stream = TcpStream::connect(socket_addr)?;
-	stream.write_all(buf.as_bytes())?;
+	let mut stream = TcpStream::connect(socket_addr).unwrap();
+	stream.write_all(buf.as_bytes()).unwrap();
 
 	let mut buf = vec![];
-	let received = stream.read_to_end(&mut buf)?;
+	let received = stream.read_to_end(&mut buf).unwrap();
 	eprintln!("[CI] receive: {}", from_utf8(&buf[..received])?);
 
 	Ok(())
@@ -601,14 +601,14 @@ fn test_mioudp(guest_ip: IpAddr) -> Result<()> {
 	let buf = "exit";
 	let socket_addr = SocketAddr::new(guest_ip, 9975);
 	eprintln!("[CI] send {buf:?} via UDP to {socket_addr}");
-	let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0))?;
-	socket.connect(socket_addr)?;
-	socket.send(buf.as_bytes())?;
+	let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0)).unwrap();
+	socket.connect(socket_addr).unwrap();
+	socket.send(buf.as_bytes()).unwrap();
 
-	socket.set_read_timeout(Some(Duration::from_secs(10)))?;
+	socket.set_read_timeout(Some(Duration::from_secs(10))).unwrap();
 	let mut buf = [0; 128];
-	let received = socket.recv(&mut buf)?;
-	eprintln!("[CI] receive: {}", from_utf8(&buf[..received])?);
+	let received = socket.recv(&mut buf).unwrap();
+	eprintln!("[CI] receive: {}", from_utf8(&buf[..received]).unwrap());
 
 	Ok(())
 }