sound: fix broken tests

staging/vhost-device-sound/src/audio_backends/pipewire.rs

@@ -498,7 +498,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::{ControlMessageKind, SoundDescriptorChain};
+    use crate::{ControlMessageKind, SoundDescriptorChain, VirtioSoundHeader};
 
     // Prepares a single chain of descriptors for request queue
     fn prepare_desc_chain<R: ByteValued>(
@@ -589,47 +589,39 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "Stream does not exist")]
-    fn test_pipewire_backend_panics() {
+    fn test_pipewire_backend_invalid_stream() {
         let stream_params = Arc::new(RwLock::new(vec![]));
 
         let pw_backend = PwBackend::new(stream_params);
 
         let msg = ctrlmsg();
-        let _ = pw_backend.set_parameters(0, msg);
-        let _ = pw_backend.prepare(0);
-    }
 
-    #[test]
-    #[should_panic]
-    fn test_pipewire_prepare_panics() {
-        let stream_params = Arc::new(RwLock::new(vec![]));
-        let pw_backend = PwBackend::new(stream_params);
-        let _ = pw_backend.prepare(0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_pipewire_start_panics() {
-        let stream_params = Arc::new(RwLock::new(vec![]));
-        let pw_backend = PwBackend::new(stream_params);
-        let _ = pw_backend.start(0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_pipewire_stop_panics() {
-        let stream_params = Arc::new(RwLock::new(vec![]));
-        let pw_backend = PwBackend::new(stream_params);
-        let _ = pw_backend.stop(0);
-    }
+        _ = pw_backend.set_parameters(0, msg.clone());
+        let resp: VirtioSoundHeader = msg
+            .desc_chain
+            .memory()
+            .read_obj(msg.descriptor.addr())
+            .unwrap();
+        assert_eq!(resp.code, VIRTIO_SND_S_BAD_MSG);
+
+        for res in [
+            pw_backend.prepare(0),
+            pw_backend.start(0),
+            pw_backend.stop(0),
+        ] {
+            assert_eq!(
+                res.unwrap_err().to_string(),
+                Error::StreamWithIdNotFound(0).to_string()
+            );
+        }
 
-    #[test]
-    #[should_panic]
-    fn test_pipewire_release_panics() {
-        let stream_params = Arc::new(RwLock::new(vec![]));
-        let pw_backend = PwBackend::new(stream_params);
         let msg = ctrlmsg();
-        let _ = pw_backend.release(0, msg);
+        _ = pw_backend.release(0, msg.clone());
+        let resp: VirtioSoundHeader = msg
+            .desc_chain
+            .memory()
+            .read_obj(msg.descriptor.addr())
+            .unwrap();
+        assert_eq!(resp.code, VIRTIO_SND_S_BAD_MSG);
     }
 }

staging/vhost-device-sound/src/device.rs

@@ -779,6 +779,7 @@ impl VhostUserBackend<VringRwLock, ()> for VhostUserSoundBackend {
     }
 }
 
+#[cfg_attr(test, derive(Clone))]
 pub struct ControlMessage {
     pub kind: ControlMessageKind,
     pub code: u32,

staging/vhost-device-sound/src/stream.rs

@@ -353,10 +353,11 @@ mod tests {
         let vq = MockSplitQueue::new(mem, 16);
         let next_addr = vq.desc_table().total_size() + 0x100;
         IOMessage {
-            vring,
             status: VIRTIO_SND_S_OK.into(),
+            latency_bytes: 0.into(),
             desc_chain: prepare_desc_chain::<VirtioSndPcmSetParams>(GuestAddress(0), hdr, 1),
-            descriptor: Descriptor::new(next_addr, 0x200, VRING_DESC_F_NEXT as u16, 1),
+            response_descriptor: Descriptor::new(next_addr, 0x200, VRING_DESC_F_NEXT as u16, 1),
+            vring,
         }
     }
 
@@ -500,7 +501,10 @@ mod tests {
         let msg = iomsg();
         let message = Arc::new(msg);
         let desc_msg = iomsg();
-        let buffer = Buffer::new(desc_msg.descriptor, message);
+        let buffer = Buffer::new(
+            desc_msg.desc_chain.clone().readable().next().unwrap(),
+            message,
+        );
 
         let mut buf = vec![0; 5];
         let result = buffer.consume(&mut buf);