Refactor fixtures into common

tests/cli/api/copy.rs

@@ -4,7 +4,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/dir_create.rs

@@ -4,7 +4,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/dir_read.rs

@@ -5,7 +5,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 /// Creates a directory in the form
 ///

tests/cli/api/exists.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/file_append.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/file_append_text.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/file_read.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/file_read_text.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/file_write.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/file_write_text.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/metadata.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::{json, Value};
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/proc_spawn.rs

@@ -2,8 +2,8 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
 use crate::cli::scripts::*;
+use crate::common::fixtures::*;
 
 fn make_cmd(args: Vec<&str>) -> String {
     format!(

tests/cli/api/remove.rs

@@ -4,7 +4,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/rename.rs

@@ -4,7 +4,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/api/search.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/system_info.rs

@@ -4,7 +4,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/version.rs

@@ -3,7 +3,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test(tokio::test)]

tests/cli/api/watch.rs

@@ -5,7 +5,7 @@ use rstest::*;
 use serde_json::json;
 use test_log::test;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 async fn wait_a_bit() {
     wait_millis(250).await;

tests/cli/client/fs_copy.rs

@@ -2,7 +2,7 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/client/fs_exists.rs

@@ -1,7 +1,7 @@
 use assert_fs::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test_log::test]

tests/cli/client/fs_make_dir.rs

@@ -2,7 +2,7 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test_log::test]

tests/cli/client/fs_metadata.rs

@@ -2,8 +2,8 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
-use crate::cli::utils::regex_pred;
+use crate::common::fixtures::*;
+use crate::common::utils::regex_pred;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/client/fs_read_directory.rs

@@ -4,8 +4,8 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
-use crate::cli::utils::regex_pred;
+use crate::common::fixtures::*;
+use crate::common::utils::regex_pred;
 
 /// Creates a directory in the form
 ///

tests/cli/client/fs_read_file.rs

@@ -3,7 +3,7 @@ use indoc::indoc;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = indoc! {r#"
     some text

tests/cli/client/fs_remove.rs

@@ -2,7 +2,7 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test_log::test]

tests/cli/client/fs_rename.rs

@@ -2,7 +2,7 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = r#"
 some text

tests/cli/client/fs_search.rs

@@ -3,7 +3,7 @@ use indoc::indoc;
 use predicates::Predicate;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const SEARCH_RESULTS_REGEX: &str = indoc! {r"
 .*?[\\/]file1.txt

tests/cli/client/fs_watch.rs

@@ -4,8 +4,8 @@ use std::time::Duration;
 use assert_fs::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
-use crate::cli::utils::ThreadedReader;
+use crate::common::fixtures::*;
+use crate::common::utils::ThreadedReader;
 
 fn wait_a_bit() {
     wait_millis(250);

tests/cli/client/fs_write.rs

@@ -3,7 +3,7 @@ use indoc::indoc;
 use predicates::prelude::*;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const FILE_CONTENTS: &str = indoc! {r#"
     some text

tests/cli/client/spawn.rs

@@ -1,8 +1,8 @@
 use rstest::*;
 
-use crate::cli::fixtures::*;
 use crate::cli::scripts::*;
-use crate::cli::utils::regex_pred;
+use crate::common::fixtures::*;
+use crate::common::utils::regex_pred;
 
 #[rstest]
 #[test_log::test]

tests/cli/client/system_info.rs

@@ -2,7 +2,7 @@ use std::env;
 
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 #[rstest]
 #[test_log::test]

tests/cli/client/version.rs

@@ -1,8 +1,8 @@
 use distant_core::protocol::PROTOCOL_VERSION;
 use rstest::*;
 
-use crate::cli::fixtures::*;
-use crate::cli::utils::TrimmedLinesMatchPredicate;
+use crate::common::fixtures::*;
+use crate::common::utils::TrimmedLinesMatchPredicate;
 
 #[rstest]
 #[test_log::test]

tests/cli/manager/capabilities.rs

@@ -1,7 +1,7 @@
 use indoc::indoc;
 use rstest::*;
 
-use crate::cli::fixtures::*;
+use crate::common::fixtures::*;
 
 const EXPECTED_TABLE: &str = indoc! {"
 +---------------+--------------------------------------------------------------+

tests/cli/mod.rs

@@ -1,6 +1,4 @@
 mod api;
 mod client;
-mod fixtures;
 mod manager;
 mod scripts;
-mod utils;

tests/cli_tests.rs

@@ -1 +1,2 @@
 mod cli;
+mod common;

tests/common/mod.rs

@@ -0,0 +1,2 @@
+pub mod fixtures;
+pub mod utils;

tests/stress/utils.rs

@@ -1,20 +0,0 @@
-/// Path to distant binary
-#[inline]
-fn bin_path() -> PathBuf {
-    assert_cmd::cargo::cargo_bin(env!("CARGO_PKG_NAME"))
-}
-
-fn start_manager() {
-    // Start the manager
-    let mut manager_cmd = StdCommand::new(bin_path());
-    manager_cmd
-        .arg("manager")
-        .arg("listen")
-        .arg("--log-file")
-        .arg(random_log_file("manager"))
-        .arg("--log-level")
-        .arg("trace")
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped());
-}

tests/stress_tests.rs

@@ -2,28 +2,30 @@ use assert_fs::prelude::*;
 use predicates::prelude::*;
 use rstest::*;
 
-mod stress;
+mod common;
+
+use common::fixtures::*;
 
 #[rstest]
 #[test_log::test]
-fn should_handle_large_volume_of_requests() {
+fn should_handle_large_volume_of_requests(ctx: DistantManagerCtx) {
     todo!();
 }
 
 #[rstest]
 #[test_log::test]
-fn should_handle_wide_spread_of_clients() {
+fn should_handle_wide_spread_of_clients(ctx: DistantManagerCtx) {
     todo!();
 }
 
 #[rstest]
 #[test_log::test]
-fn should_handle_abrupt_client_disconnects() {
+fn should_handle_abrupt_client_disconnects(ctx: DistantManagerCtx) {
     todo!();
 }
 
 #[rstest]
 #[test_log::test]
-fn should_handle_badly_killing_client_shell_with_interactive_process() {
+fn should_handle_badly_killing_client_shell_with_interactive_process(ctx: DistantManagerCtx) {
     todo!();
 }