--- a/Cargo.toml +++ b/Cargo.toml @@ -76,6 +76,6 @@ -[dev-dependencies.actix-files] +[disabled.dev-dependencies.actix-files] version = "0.6" -[dev-dependencies.actix-web] +[disabled.dev-dependencies.actix-web] version = "4" --- a/tests/common.rs +++ b/tests/common.rs @@ -1,5 +1,5 @@ -use actix_files as fs; -use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; +//use actix_files as fs; +//use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; use crossbeam_channel as cbc; use rand::RngCore; use std::{io::Write, path::PathBuf, sync::Arc}; @@ -11,7 +11,7 @@ tx: Arc>, } -async fn log_handler(req: HttpRequest, data: web::Data) -> impl Responder { +/*async fn log_handler(req: HttpRequest, data: web::Data) -> impl Responder { if data.tx.send(req.uri().to_string()).is_err() { panic!("channel send failed"); } @@ -25,9 +25,9 @@ .content_type("text/html; charset=utf-8") .body(format!("

URI: {}

", req.uri())) } -} +}*/ -async fn delayed_response(req: HttpRequest) -> impl Responder { +/*async fn delayed_response(req: HttpRequest) -> impl Responder { let qs = req.query_string(); let ms: u64 = qs .replace("ms=", "") @@ -39,9 +39,9 @@ .body(format!( "

Delayed by {qs}ms

" )) -} +}*/ -pub async fn check_request_received_using(uri: String, host: &str, op: F) +/*pub async fn check_request_received_using(uri: String, host: &str, op: F) where F: FnOnce(&str, u16), { @@ -90,17 +90,17 @@ // stop the server server_handle.stop(true).await; -} +}*/ -#[allow(dead_code)] +/*#[allow(dead_code)] pub async fn check_request_received(browser: Browser, uri: String) { check_request_received_using(uri, "127.0.0.1", |url, _port| { open_browser(browser, url).expect("failed to open browser"); }) .await; -} +}*/ -#[allow(dead_code)] +/*#[allow(dead_code)] pub async fn check_local_file(browser: Browser, html_dir: Option, url_op: F) where F: FnOnce(&PathBuf) -> String, @@ -127,13 +127,13 @@ }) .await; let _ = std::fs::remove_file(&pb); -} +}*/ -#[allow(dead_code)] +/*#[allow(dead_code)] pub async fn check_browser(browser: Browser, platform: &str) { check_request_received(browser, format!("/{platform}")).await; check_request_received(browser, format!("/{platform}/😀😀😀")).await; -} +}*/ const URI_PNG_1PX: &str = "/img/1px.png"; Index: webbrowser/tests/test_unix.rs =================================================================== --- webbrowser.orig/tests/test_unix.rs +++ webbrowser/tests/test_unix.rs @@ -9,11 +9,11 @@ mod tests { use serial_test::serial; use webbrowser::Browser; - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + /*#[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[serial] async fn test_open_default() { check_browser(Browser::Default, TEST_PLATFORM).await; - } + }*/ #[test] fn test_existence_default() { @@ -25,7 +25,7 @@ mod tests { assert!(!Browser::Safari.exists(), "should not have found Safari"); } - #[cfg(not(feature = "hardened"))] + /*#[cfg(not(feature = "hardened"))] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[serial] async fn test_local_file_abs_path() { @@ -60,7 +60,7 @@ mod tests { .to_string() }) .await; - } + }*/ #[cfg(feature = "hardened")] #[test] --- a/tests/test_wasm.rs +++ b/tests/test_wasm.rs @@ -5,14 +5,14 @@ mod common; mod tests { const TEST_PLATFORM: &str = "wasm32"; - use super::common::check_request_received_using; + //use super::common::check_request_received_using; use std::fs; use std::path::PathBuf; // to run this test, run it as: // cargo test --test test_wasm32 -- --ignored // - #[ignore] + /*#[ignore] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_wasm32() { let uri = &format!("/{TEST_PLATFORM}"); @@ -43,5 +43,5 @@ mod tests { status.expect("browser open failed"); }) .await; - } + }*/ }