Merge pull request #65 from aeyakovenko/fixtest

fix test
This commit is contained in:
anatoly yakovenko 2018-03-14 12:21:08 -07:00 committed by GitHub
commit e054238af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions

View File

@ -1,5 +1,6 @@
use std::sync::{Arc, Mutex, RwLock};
use std::sync::mpsc;
use std::fmt;
use std::time::Duration;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket};
use std::thread::{spawn, JoinHandle};
@ -16,7 +17,16 @@ pub struct Packet {
pub port: u16,
pub v6: bool,
}
impl fmt::Debug for Packet {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(
f,
"Packet {{ size: {:?}, addr: {:?} }}",
self.size,
self.get_addr()
)
}
}
impl Default for Packet {
fn default() -> Packet {
Packet {
@ -72,6 +82,7 @@ impl Packet {
}
}
#[derive(Clone, Debug)]
pub struct PacketData {
pub packets: Vec<Packet>,
}
@ -213,6 +224,8 @@ mod test {
use std::thread::{spawn, JoinHandle};
use std::sync::mpsc::channel;
use result::Result;
use std::io::Write;
use std::io;
use streamer::{allocate, receiver, recycle, sender, Packet, Receiver, Recycler, PACKET_SIZE};
fn producer(addr: &SocketAddr, recycler: Recycler, exit: Arc<Mutex<bool>>) -> JoinHandle<()> {
@ -292,11 +305,11 @@ mod test {
}
fn get_msgs(r: Receiver, num: &mut usize) {
for _ in [0..5].iter() {
for _t in 0..5 {
let timer = Duration::new(1, 0);
match r.recv_timeout(timer) {
Ok(m) => *num += m.read().unwrap().packets.len(),
_ => (),
e => println!("error {:?}", e),
}
if *num == 10 {
break;
@ -331,7 +344,10 @@ mod test {
t_receiver.join().expect("join");
t_sender.join().expect("join");
}
#[test]
pub fn streamer_debug() {
write!(io::sink(), "{:?}", Packet::default()).unwrap();
}
#[test]
pub fn streamer_send_test() {
let read = UdpSocket::bind("127.0.0.1:0").expect("bind");