Skip to content

[WIP] Improve testing robustness #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stanciuadrian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Improve testing robustness #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
711394f
Fix HTTP headers verification
stanciuadrian Oct 31, 2018
206e0b0
fix case when comparing with lowercase header
stanciuadrian Nov 10, 2018
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
93 changes: 54 additions & 39 deletions tests/reqwest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,34 @@ mod server;

fn server() -> Server {
let s = Server::new();
s.receive("\
GET / HTTP/1.1\r\n\
Host: 127.0.0.1:$PORT\r\n\
User-Agent: reqwest/0.8.0\r\n\
Accept: text/event-stream\r\n\
Accept-Encoding: gzip\r\n\
\r\n");
s.receive(
"\
GET / HTTP/1.1\r\n\
Host: 127.0.0.1:$PORT\r\n\
User-Agent: reqwest/0.8.8\r\n\
Accept: text/event-stream\r\n\
Accept-Encoding: gzip\r\n\
\r\n",
);
return s;
}

#[test]
fn simple_events() {
let s = server();
s.send("HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream\r\n\
\r\n\
id: 42\r\n\
event: foo\r\n\
data: bar\r\n\
\r\n\
event: bar\n\
: comment\n\
data: baz\n\
\n");
s.send(
"HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream\r\n\
\r\n\
id: 42\r\n\
event: foo\r\n\
data: bar\r\n\
\r\n\
event: bar\n\
: comment\n\
data: baz\n\
\n",
);

println!("url: {}", s.url("/"));
let mut client = Client::new(Url::parse(&s.url("/")).unwrap());
Expand All @@ -52,12 +56,14 @@ data: baz\n\
#[test]
fn retry() {
let s = server();
s.send("HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream\r\n\
\r\n\
retry: 42\r\n\
data: bar\r\n\
\r\n");
s.send(
"HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream\r\n\
\r\n\
retry: 42\r\n\
data: bar\r\n\
\r\n",
);

println!("url: {}", s.url("/"));
let mut client = Client::new(Url::parse(&s.url("/")).unwrap());
Expand All @@ -69,10 +75,12 @@ data: bar\r\n\
#[test]
fn missing_content_type() {
let s = server();
s.send("HTTP/1.1 200 OK\r\n\
\r\n\
data: bar\r\n\
\r\n");
s.send(
"HTTP/1.1 200 OK\r\n\
\r\n\
data: bar\r\n\
\r\n",
);

let mut client = Client::new(Url::parse(&s.url("/")).unwrap());
match client.next().unwrap() {
Expand All @@ -84,11 +92,13 @@ data: bar\r\n\
#[test]
fn invalid_content_type() {
let s = server();
s.send("HTTP/1.1 200 OK\r\n\
Content-Type: text/plain\r\n\
\r\n\
data: bar\r\n\
\r\n");
s.send(
"HTTP/1.1 200 OK\r\n\
Content-Type: text/plain\r\n\
\r\n\
data: bar\r\n\
\r\n",
);

let mut client = Client::new(Url::parse(&s.url("/")).unwrap());
match client.next().unwrap() {
Expand All @@ -100,13 +110,18 @@ data: bar\r\n\
#[test]
fn content_type_with_mime_parameter() {
let s = server();
s.send("HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream;charset=utf8\r\n\
\r\n\
data: bar\r\n\
\r\n");
s.send(
"HTTP/1.1 200 OK\r\n\
Content-Type: text/event-stream;charset=utf8\r\n\
\r\n\
data: bar\r\n\
\r\n",
);

let mut client = Client::new(Url::parse(&s.url("/")).unwrap());
let event = client.next().unwrap().expect("MIME parameter should be ignored");
let event = client
.next()
.unwrap()
.expect("MIME parameter should be ignored");
assert_eq!(event.data, "bar\n");
}
60 changes: 33 additions & 27 deletions tests/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
#![allow(dead_code)]

use std::collections::HashSet;
use std::net::{TcpListener, SocketAddr, TcpStream};
use std::io::prelude::*;
use std::thread;
use std::sync::mpsc::{Sender, Receiver, channel};
use std::io::BufReader;
use std::net::{SocketAddr, TcpListener, TcpStream};
use std::sync::mpsc::{channel, Receiver, Sender};
use std::thread;

macro_rules! t {
($e:expr) => (match $e {
Ok(e) => e,
Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
})
($e:expr) => {
match $e {
Ok(e) => e,
Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
}
};
}

pub struct Server {
Expand All @@ -35,41 +37,44 @@ fn run(listener: &TcpListener, rx: &Receiver<Message>) {
while let Some(i) = expected.find("\n") {
let line = &expected[..i + 1];
expected = &expected[i + 1..];
expected_headers.insert(line);
expected_headers.insert(line.to_ascii_lowercase());
if line == "\r\n" {
break
break;
}
}

let mut expected_len = None;
while expected_headers.len() > 0 {
let mut actual = String::new();
t!(socket.read_line(&mut actual));
if actual.starts_with("Content-Length") {
actual = actual.to_ascii_lowercase();
if actual.starts_with("content-length") {
let len = actual.split(": ").skip(1).next().unwrap();
expected_len = len.trim().parse().ok();
}
// various versions of libcurl do different things here
if actual == "Proxy-Connection: Keep-Alive\r\n" {
continue
if actual == "proxy-connection: keep-alive\r\n" {
continue;
}
if expected_headers.remove(&actual[..]) {
continue
continue;
}

let mut found = None;
for header in expected_headers.iter() {
if lines_match(header, &actual) {
found = Some(header.clone());
break
break;
}
}
if let Some(found) = found {
expected_headers.remove(&found);
continue
continue;
}
panic!("unexpected header: {:?} (remaining headers {:?})",
actual, expected_headers);
panic!(
"unexpected header: {:?} (remaining headers {:?})",
actual, expected_headers
);
}
for header in expected_headers {
panic!("expected header but not found: {:?}", header);
Expand All @@ -84,7 +89,7 @@ fn run(listener: &TcpListener, rx: &Receiver<Message>) {
line.truncate(0);
t!(socket.read_line(&mut line));
if line.len() == 0 {
break
break;
}
if expected.len() == 0 {
panic!("unexpected line: {:?}", line);
Expand All @@ -93,19 +98,22 @@ fn run(listener: &TcpListener, rx: &Receiver<Message>) {
let expected_line = &expected[..i + 1];
expected = &expected[i + 1..];
if lines_match(expected_line, &line) {
continue
continue;
}
panic!("lines didn't match:\n\
expected: {:?}\n\
actual: {:?}\n", expected_line, line)
panic!(
"lines didn't match:\n\
expected: {:?}\n\
actual: {:?}\n",
expected_line, line
)
}
if expected.len() != 0 {
println!("didn't get expected data: {:?}", expected);
}
}
Message::Write(ref to_write) => {
t!(socket.get_mut().write_all(to_write.as_bytes()));
return
return;
}
}
}
Expand All @@ -120,13 +128,11 @@ fn lines_match(expected: &str, mut actual: &str) -> bool {
match actual.find(part) {
Some(j) => {
if i == 0 && j != 0 {
return false
return false;
}
actual = &actual[j + part.len()..];
}
None => {
return false
}
None => return false,
}
}
actual.is_empty() || expected.ends_with("[..]")
Expand Down