From 55665fde9a41ccbd6d9f4f43150a88523a88969d Mon Sep 17 00:00:00 2001 From: evan-schott <53463459+evan-schott@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:47:49 -0800 Subject: [PATCH] serial tests --- Cargo.lock | 70 ++++++++++++++++++++++++++++++++++++++ Cargo.toml | 3 ++ leo/cli/cli.rs | 3 ++ leo/package/Cargo.toml | 3 ++ utils/retriever/Cargo.toml | 3 ++ utils/retriever/src/lib.rs | 5 +++ 6 files changed, 87 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 33dd5fef32..8faf930d51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -735,6 +735,19 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "der" version = "0.7.8" @@ -1000,6 +1013,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3" +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.29" @@ -1007,6 +1035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1015,6 +1044,17 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-io" version = "0.3.29" @@ -1039,8 +1079,10 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ + "futures-channel", "futures-core", "futures-io", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -1460,6 +1502,7 @@ dependencies = [ "self_update 0.39.0", "serde", "serde_json", + "serial_test", "snarkvm", "sys-info", "test_dir", @@ -1481,6 +1524,7 @@ dependencies = [ "rand", "retriever", "serde", + "serial_test", "snarkvm", "toml 0.8.8", "tracing", @@ -2199,6 +2243,7 @@ dependencies = [ "leo-span", "serde", "serde_json", + "serial_test", "sha2", "tempfile", "toml 0.8.8", @@ -2472,6 +2517,31 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "serial_test" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote 1.0.33", + "syn 2.0.39", +] + [[package]] name = "sha1" version = "0.10.6" diff --git a/Cargo.toml b/Cargo.toml index aa6109d5e0..6feff5fdc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -143,6 +143,9 @@ features = [ "derive" ] [dependencies.serde_json] version = "1.0" +[dependencies.serial_test] +version = "2.0.0" + [dependencies.snarkvm] workspace = true features = [ "circuit", "console" ] diff --git a/leo/cli/cli.rs b/leo/cli/cli.rs index 2f2d41b889..4ac65e7dff 100644 --- a/leo/cli/cli.rs +++ b/leo/cli/cli.rs @@ -20,6 +20,7 @@ use leo_errors::Result; use clap::Parser; use colored::Colorize; use std::{path::PathBuf, process::exit}; +use serial_test::serial; /// CLI Arguments entry point - includes global parameters and subcommands #[derive(Parser, Debug)] @@ -160,6 +161,7 @@ pub fn build_nested_test() -> Result<()> { } #[test] +#[serial] pub fn mixed_local_network_build_test() -> Result<()> { use leo_span::symbol::create_session_if_not_set_then; @@ -182,6 +184,7 @@ pub fn mixed_local_network_build_test() -> Result<()> { } #[test] +#[serial] pub fn double_nested_program_run_test() -> Result<()> { use crate::cli::commands::Run; use leo_span::symbol::create_session_if_not_set_then; diff --git a/leo/package/Cargo.toml b/leo/package/Cargo.toml index e341af7771..94bf297c7e 100644 --- a/leo/package/Cargo.toml +++ b/leo/package/Cargo.toml @@ -40,6 +40,9 @@ version = "0.8" version = "1.0" features = [ "derive" ] +[dependencies.serial_test] +version = "2.0.0" + [dependencies.toml] version = "0.8" diff --git a/utils/retriever/Cargo.toml b/utils/retriever/Cargo.toml index 1d009861a9..97ae9da6b4 100644 --- a/utils/retriever/Cargo.toml +++ b/utils/retriever/Cargo.toml @@ -38,6 +38,9 @@ path = "../disassembler" [dependencies.sha2] version = "0.10.8" +[dependencies.serial_test] +version = "2.0.0" + [dependencies.leo-span] version = "1.9.4" path = "../../compiler/span" diff --git a/utils/retriever/src/lib.rs b/utils/retriever/src/lib.rs index 008cf6dadf..798e606ef0 100644 --- a/utils/retriever/src/lib.rs +++ b/utils/retriever/src/lib.rs @@ -26,9 +26,11 @@ mod tests { use aleo_std::aleo_dir; use leo_span::{symbol::create_session_if_not_set_then, Symbol}; use std::path::PathBuf; + use serial_test::serial; #[test] #[ignore] + #[serial] fn temp_dir_test() { // Test pulling nested dependencies from network const BUILD_DIRECTORY: &str = "../tmp/nested"; @@ -46,6 +48,7 @@ mod tests { #[test] #[ignore] + #[serial] fn mac_test() { // Test pulling nested dependencies from network const BUILD_DIRECTORY: &str = "../tmp/nested"; @@ -63,6 +66,7 @@ mod tests { #[test] #[ignore] + #[serial] fn simple_dir_test() { // Test pulling nested dependencies from network const BUILD_DIRECTORY: &str = "../tmp/simple"; @@ -80,6 +84,7 @@ mod tests { #[test] #[ignore] + #[serial] fn local_dir_test() { // Test pulling nested dependencies from network const BUILD_DIRECTORY: &str = "../tmp/local_test";