tests: Cleanup: streamline structure of _server() helpers

Change the way parameter unwrapping / conditional execution is handled,
so the active code in the `*_server()` functions is more in line with
the corresponding `*_fork()` variants. This should faciliate keeping
the fork/spawn variants in sync.

Author: antrik

src/platform/test.rs

@@ -662,13 +662,12 @@ fn cross_process_server()
 {
     let data: &[u8] = b"1234567";
     let channel_name = get_channel_name_arg("server");
-    if channel_name.is_none() {
-        return;
-    }
+    if let Some(channel_name) = channel_name {
+        let tx = OsIpcSender::connect(channel_name).unwrap();
+        tx.send(data, vec![], vec![]).unwrap();
 
-    let tx = OsIpcSender::connect(channel_name.unwrap()).unwrap();
-    tx.send(data, vec![], vec![]).unwrap();
-    unsafe { libc::exit(0); }
+        unsafe { libc::exit(0); }
+    }
 }
 
 #[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
@@ -721,18 +720,17 @@ fn cross_process_fork() {
 fn cross_process_sender_transfer_server()
 {
     let channel_name = get_channel_name_arg("server");
-    if channel_name.is_none() {
-        return;
-    }
+    if let Some(channel_name) = channel_name {
+        let super_tx = OsIpcSender::connect(channel_name).unwrap();
+        let (sub_tx, sub_rx) = platform::channel().unwrap();
+        let data: &[u8] = b"foo";
+        super_tx.send(data, vec![OsIpcChannel::Sender(sub_tx)], vec![]).unwrap();
+        sub_rx.recv().unwrap();
+        let data: &[u8] = b"bar";
+        super_tx.send(data, vec![], vec![]).unwrap();
 
-    let super_tx = OsIpcSender::connect(channel_name.unwrap()).unwrap();
-    let (sub_tx, sub_rx) = platform::channel().unwrap();
-    let data: &[u8] = b"foo";
-    super_tx.send(data, vec![OsIpcChannel::Sender(sub_tx)], vec![]).unwrap();
-    sub_rx.recv().unwrap();
-    let data: &[u8] = b"bar";
-    super_tx.send(data, vec![], vec![]).unwrap();
-    unsafe { libc::exit(0); }
+        unsafe { libc::exit(0); }
+    }
 }
 
 #[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
@@ -968,38 +966,36 @@ fn cross_process_two_step_transfer_server()
 {
     let cookie: &[u8] = b"cookie";
     let channel_name = get_channel_name_arg("server");
-    if channel_name.is_none() {
-        return;
-    }
-
-    // connect by name to our other process
-    let super_tx = OsIpcSender::connect(channel_name.unwrap()).unwrap();
+    if let Some(channel_name) = channel_name {
+        // connect by name to our other process
+        let super_tx = OsIpcSender::connect(channel_name).unwrap();
 
-    // create a channel for real communication between the two processes
-    let (sub_tx, sub_rx) = platform::channel().unwrap();
+        // create a channel for real communication between the two processes
+        let (sub_tx, sub_rx) = platform::channel().unwrap();
 
-    // send the other process the tx side, so it can send us the channels
-    super_tx.send(&[], vec![OsIpcChannel::Sender(sub_tx)], vec![]).unwrap();
+        // send the other process the tx side, so it can send us the channels
+        super_tx.send(&[], vec![OsIpcChannel::Sender(sub_tx)], vec![]).unwrap();
 
-    // get two_rx from the other process
-    let (_, mut received_channels, _) = sub_rx.recv().unwrap();
-    assert_eq!(received_channels.len(), 1);
-    let two_rx = received_channels[0].to_receiver();
+        // get two_rx from the other process
+        let (_, mut received_channels, _) = sub_rx.recv().unwrap();
+        assert_eq!(received_channels.len(), 1);
+        let two_rx = received_channels[0].to_receiver();
 
-    // get one_rx from two_rx's buffer
-    let (_, mut received_channels, _) = two_rx.recv().unwrap();
-    assert_eq!(received_channels.len(), 1);
-    let one_rx = received_channels[0].to_receiver();
+        // get one_rx from two_rx's buffer
+        let (_, mut received_channels, _) = two_rx.recv().unwrap();
+        assert_eq!(received_channels.len(), 1);
+        let one_rx = received_channels[0].to_receiver();
 
-    // get a cookie from one_rx
-    let (data, _, _) = one_rx.recv().unwrap();
-    assert_eq!(&data[..], cookie);
+        // get a cookie from one_rx
+        let (data, _, _) = one_rx.recv().unwrap();
+        assert_eq!(&data[..], cookie);
 
-    // finally, send a cookie back
-    super_tx.send(&data, vec![], vec![]).unwrap();
+        // finally, send a cookie back
+        super_tx.send(&data, vec![], vec![]).unwrap();
 
-    // terminate
-    unsafe { libc::exit(0); }
+        // terminate
+        unsafe { libc::exit(0); }
+    }
 }
 
 // TODO -- this fails on OSX with a MACH_SEND_INVALID_RIGHT!

src/test.rs

@@ -163,25 +163,18 @@ fn select() {
 fn cross_process_embedded_senders_server() {
     let person = ("Patrick Walton".to_owned(), 29);
 
-    let server0_name = if let Some(name) = get_channel_name_arg("server0") {
-        name
-    } else {
-        return
-    };
-    let server2_name = if let Some(name) = get_channel_name_arg("server2") {
-        name
-    } else {
-        return
-    };
-
-    let (tx1, rx1): (IpcSender<Person>, IpcReceiver<Person>) = ipc::channel().unwrap();
-    let tx0 = IpcSender::connect(server0_name).unwrap();
-    tx0.send(tx1).unwrap();
-    rx1.recv().unwrap();
-    let tx2: IpcSender<Person> = IpcSender::connect(server2_name).unwrap();
-    tx2.send(person.clone()).unwrap();
+    let server0_name = get_channel_name_arg("server0");
+    let server2_name = get_channel_name_arg("server2");
+    if let (Some(server0_name), Some(server2_name)) = (server0_name, server2_name) {
+        let (tx1, rx1): (IpcSender<Person>, IpcReceiver<Person>) = ipc::channel().unwrap();
+        let tx0 = IpcSender::connect(server0_name).unwrap();
+        tx0.send(tx1).unwrap();
+        rx1.recv().unwrap();
+        let tx2: IpcSender<Person> = IpcSender::connect(server2_name).unwrap();
+        tx2.send(person.clone()).unwrap();
 
-    unsafe { libc::exit(0); }
+        unsafe { libc::exit(0); }
+    }
 }
 
 #[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]