update tests

Signed-off-by: Yoshua Wuyts <[email protected]>

Author: yoshuawuyts

tests/common/mod.rs

@@ -1,4 +1,6 @@
-use std::{fs::File, path::PathBuf};
+use async_std::io::Read;
+use async_std::fs::File;
+use async_std::path::PathBuf;
 
 #[macro_export]
 macro_rules! assert {
@@ -25,22 +27,9 @@ macro_rules! assert {
     };
 }
 
-pub fn read_fixture(name: &str) -> Vec<u8> {
-    use std::io::Read;
-
+pub fn read_fixture(name: &str) -> Arc<File> {
     let directory: PathBuf = env!("CARGO_MANIFEST_DIR").into();
     let path: PathBuf = format!("tests/fixtures/{}.txt", name).into();
     let mut file = File::open(directory.join(path)).expect("Reading fixture file didn't work");
-    let mut contents = Vec::new();
-    file.read_to_end(&mut contents)
-        .expect("Couldn't read fixture files contents");
-
-    let mut result = Vec::<u8>::new();
-    for byte in contents {
-        if byte == 0x0A {
-            result.push(0x0D);
-        }
-        result.push(byte);
-    }
-    result
+    Arc::new(file)
 }

tests/server.rs

@@ -1,6 +1,5 @@
 mod common;
 use async_h1::server;
-use async_std::io::Cursor;
 use async_std::task;
 use common::read_fixture;
 use http_types::{Response, StatusCode};
@@ -15,7 +14,7 @@ fn test_basic_request() {
     assert!(
         actual,
         expected,
-        server::accept(addr, Cursor::new(request), &mut actual, |_req| {
+        server::accept(addr, request, &mut actual, |_req| {
             async {
                 let mut resp = Response::new(StatusCode::Ok);
                 resp.set_body("");