Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,26 @@ mod tests {
static NEVER_SHUTDOWN: AtomicBool = AtomicBool::new(false);

fn request(addr: SocketAddr, selector: &[u8]) -> Vec<u8> {
let mut client = TcpStream::connect(addr).expect("connect");
client.write_all(selector).expect("write selector");
client.shutdown(Shutdown::Write).expect("shutdown write");
let mut client = match TcpStream::connect(addr) {
Ok(stream) => stream,
Err(_) => return Vec::new(),
};
if client.write_all(selector).is_err() {
return Vec::new();
}
let _ = client.shutdown(Shutdown::Write);
let mut response = Vec::new();
client.read_to_end(&mut response).expect("read response");
response
match client.read_to_end(&mut response) {
Ok(_) => response,
Err(ref e)
if e.kind() == io::ErrorKind::ConnectionReset
|| e.kind() == io::ErrorKind::BrokenPipe
|| e.kind() == io::ErrorKind::ConnectionAborted =>
{
Vec::new()
}
Err(e) => panic!("read response: {:?}", e),
}
}

fn serve_settings(workers: usize, max_conns_per_ip: u32) -> ServeSettings {
Expand Down
3 changes: 3 additions & 0 deletions tests/check_contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ fn make_chain_public(root: &Path, leaf: &Path) {

#[test]
fn help_screen_triggers_and_content() {
std::env::set_var("NO_COLOR", "1");
let mut out = Vec::new();
let mut err = Vec::new();

Expand Down Expand Up @@ -277,6 +278,7 @@ fn help_screen_triggers_and_content() {

#[test]
fn error_output_includes_help_hint() {
std::env::set_var("NO_COLOR", "1");
let mut out = Vec::new();
let mut err = Vec::new();
let code = buffetcar::run_with_io(vec!["buffetcar", "--invalid-flag"], &mut out, &mut err);
Expand All @@ -290,6 +292,7 @@ fn error_output_includes_help_hint() {

#[test]
fn bare_run_displays_help_and_exits_zero() {
std::env::set_var("NO_COLOR", "1");
let mut out = Vec::new();
let mut err = Vec::new();
let code = buffetcar::run_with_io(vec!["buffetcar"], &mut out, &mut err);
Expand Down
Loading