From c77a71afd40b298887ff1ad16e802b9552b101a0 Mon Sep 17 00:00:00 2001 From: Furisto <24721048+Furisto@users.noreply.github.com> Date: Wed, 20 Oct 2021 22:10:06 +0200 Subject: [PATCH] Move test framework and integration tests --- Cargo.lock | 237 ++++++++++++++---- Cargo.toml | 5 +- crates/cgroups/Cargo.toml | 2 +- .../integration_test}/Cargo.lock | 0 .../integration_test}/Cargo.toml | 9 +- .../integration_test}/README.md | 0 .../integration_test}/build.sh | 0 .../integration_test}/bundle.tar.gz | Bin .../integration_test}/run_tests.sh | 0 .../integration_test}/src/lib.rs | 0 .../integration_test}/src/main.rs | 0 .../src/tests/cgroups/blkio.rs | 0 .../src/tests/cgroups/mod.rs | 0 .../src/tests/cgroups/pids.rs | 0 .../src/tests/lifecycle/container_create.rs | 0 .../tests/lifecycle/container_lifecycle.rs | 0 .../src/tests/lifecycle/create.rs | 0 .../src/tests/lifecycle/delete.rs | 0 .../src/tests/lifecycle/kill.rs | 0 .../src/tests/lifecycle/mod.rs | 0 .../src/tests/lifecycle/start.rs | 0 .../src/tests/lifecycle/state.rs | 0 .../src/tests/lifecycle/util.rs | 0 .../integration_test}/src/tests/mod.rs | 0 .../src/tests/pidfile/mod.rs | 0 .../src/tests/pidfile/pidfile_test.rs | 0 .../integration_test}/src/tests/tlb/mod.rs | 0 .../src/tests/tlb/tlb_test.rs | 0 .../integration_test}/src/utils/mod.rs | 0 .../integration_test}/src/utils/support.rs | 0 .../integration_test}/src/utils/temp_dir.rs | 0 .../integration_test}/src/utils/test_utils.rs | 0 .../test_framework/Cargo.toml | 0 .../test_framework/README.md | 0 .../test_framework/src/conditional_test.rs | 0 .../test_framework/src/lib.rs | 0 .../test_framework/src/test.rs | 0 .../test_framework/src/test_group.rs | 0 .../test_framework/src/test_manager.rs | 0 .../test_framework/src/testable.rs | 0 src/commands/create.rs | 2 +- src/commands/delete.rs | 2 +- src/commands/events.rs | 2 +- src/commands/exec.rs | 2 +- src/commands/kill.rs | 2 +- src/commands/pause.rs | 2 +- src/commands/ps.rs | 2 +- src/commands/resume.rs | 2 +- src/commands/run.rs | 2 +- src/commands/start.rs | 2 +- src/commands/state.rs | 2 +- youki_integration_test/.gitignore | 3 - 52 files changed, 203 insertions(+), 75 deletions(-) rename {youki_integration_test => crates/integration_test}/Cargo.lock (100%) rename {youki_integration_test => crates/integration_test}/Cargo.toml (81%) rename {youki_integration_test => crates/integration_test}/README.md (100%) rename {youki_integration_test => crates/integration_test}/build.sh (100%) rename {youki_integration_test => crates/integration_test}/bundle.tar.gz (100%) rename {youki_integration_test => crates/integration_test}/run_tests.sh (100%) rename {youki_integration_test => crates/integration_test}/src/lib.rs (100%) rename {youki_integration_test => crates/integration_test}/src/main.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/cgroups/blkio.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/cgroups/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/cgroups/pids.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/container_create.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/container_lifecycle.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/create.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/delete.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/kill.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/start.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/state.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/lifecycle/util.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/pidfile/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/pidfile/pidfile_test.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/tlb/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/tests/tlb/tlb_test.rs (100%) rename {youki_integration_test => crates/integration_test}/src/utils/mod.rs (100%) rename {youki_integration_test => crates/integration_test}/src/utils/support.rs (100%) rename {youki_integration_test => crates/integration_test}/src/utils/temp_dir.rs (100%) rename {youki_integration_test => crates/integration_test}/src/utils/test_utils.rs (100%) rename {youki_integration_test => crates}/test_framework/Cargo.toml (100%) rename {youki_integration_test => crates}/test_framework/README.md (100%) rename {youki_integration_test => crates}/test_framework/src/conditional_test.rs (100%) rename {youki_integration_test => crates}/test_framework/src/lib.rs (100%) rename {youki_integration_test => crates}/test_framework/src/test.rs (100%) rename {youki_integration_test => crates}/test_framework/src/test_group.rs (100%) rename {youki_integration_test => crates}/test_framework/src/test_manager.rs (100%) rename {youki_integration_test => crates}/test_framework/src/testable.rs (100%) delete mode 100644 youki_integration_test/.gitignore diff --git a/Cargo.lock b/Cargo.lock index 0398915c..376e3bac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,15 +17,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.43" @@ -107,7 +98,7 @@ name = "cgroups" version = "0.1.0" dependencies = [ "anyhow", - "clap 2.33.3", + "clap", "dbus", "env_logger 0.9.0", "errno", @@ -115,7 +106,7 @@ dependencies = [ "libc", "log", "nix", - "oci-spec", + "oci-spec 0.5.2 (git+https://github.com/containers/oci-spec-rs?rev=d6fb1e91742313cd0d0085937e2d6df5d4669720)", "procfs", "quickcheck", "rbpf", @@ -140,40 +131,28 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "3.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142" dependencies = [ - "ansi_term", "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.0.0-beta.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406" -dependencies = [ "bitflags", "clap_derive", "indexmap", "lazy_static", "os_str_bytes", - "strsim 0.10.0", - "textwrap 0.14.2", + "strsim", + "termcolor", + "textwrap", + "unicode-width", "vec_map", ] [[package]] name = "clap_derive" -version = "3.0.0-beta.4" +version = "3.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac" +checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1" dependencies = [ "heck", "proc-macro-error", @@ -201,6 +180,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" version = "0.5.1" @@ -211,6 +204,40 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.5" @@ -251,7 +278,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn", ] @@ -308,6 +335,12 @@ dependencies = [ "syn", ] +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + [[package]] name = "env_logger" version = "0.8.4" @@ -361,6 +394,18 @@ dependencies = [ "instant", ] +[[package]] +name = "filetime" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "winapi", +] + [[package]] name = "flate2" version = "1.0.21" @@ -591,6 +636,26 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "integration_test" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "clap_derive", + "flate2", + "oci-spec 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "once_cell", + "procfs", + "rand", + "serde", + "serde_json", + "tar", + "test_framework", + "uuid", + "which", +] + [[package]] name = "itoa" version = "0.4.8" @@ -755,6 +820,19 @@ dependencies = [ "libc", ] +[[package]] +name = "oci-spec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63f0f82a50257e72a6f13616dc093f3d0874294629bf8b7d0bc2a098e3db324f" +dependencies = [ + "derive_builder", + "getset", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "oci-spec" version = "0.5.2" @@ -776,9 +854,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "os_str_bytes" -version = "3.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" +checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85" [[package]] name = "parking_lot" @@ -839,6 +917,12 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +[[package]] +name = "ppv-lite86" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" + [[package]] name = "prctl" version = "1.0.0" @@ -935,6 +1019,19 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", "rand_core", ] @@ -947,6 +1044,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core", +] + [[package]] name = "rbpf" version = "0.1.0" @@ -1070,12 +1176,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -1117,6 +1217,17 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "tar" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "termcolor" version = "1.1.2" @@ -1127,19 +1238,21 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +name = "test_framework" +version = "0.1.0" dependencies = [ - "unicode-width", + "anyhow", + "crossbeam", ] [[package]] name = "textwrap" -version = "0.14.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789" +dependencies = [ + "unicode-width", +] [[package]] name = "thiserror" @@ -1195,6 +1308,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55bcbb425141152b10d5693095950b51c3745d019363fc2929ffd8f61449b628" +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + [[package]] name = "vec_map" version = "0.8.2" @@ -1213,6 +1332,17 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "which" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +dependencies = [ + "either", + "lazy_static", + "libc", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1244,6 +1374,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "xattr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +dependencies = [ + "libc", +] + [[package]] name = "youki" version = "0.0.1" @@ -1252,7 +1391,7 @@ dependencies = [ "caps", "cgroups", "chrono", - "clap 3.0.0-beta.4", + "clap", "crossbeam-channel", "dbus", "fastrand", @@ -1261,7 +1400,7 @@ dependencies = [ "log", "mio", "nix", - "oci-spec", + "oci-spec 0.5.2 (git+https://github.com/containers/oci-spec-rs?rev=d6fb1e91742313cd0d0085937e2d6df5d4669720)", "once_cell", "path-clean", "pentacle", diff --git a/Cargo.toml b/Cargo.toml index 9ff6146d..ce04afdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,16 +9,13 @@ description = "A container runtime written in Rust" members = [ "crates/*" ] -exclude = [ - "youki_integration_test", -] [features] default = ["systemd_cgroups"] systemd_cgroups = ["systemd"] [dependencies.clap] -version = "3.0.0-beta.4" +version = "3.0.0-beta.2" default-features = false features = ["std", "suggestions", "derive", "cargo"] diff --git a/crates/cgroups/Cargo.toml b/crates/cgroups/Cargo.toml index 33be1f05..f439c7b0 100644 --- a/crates/cgroups/Cargo.toml +++ b/crates/cgroups/Cargo.toml @@ -26,7 +26,7 @@ libc = { version = "0.2.84", optional = true } [dev-dependencies] oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "d6fb1e91742313cd0d0085937e2d6df5d4669720", features = ["proptests"] } quickcheck = "1" -clap = "2" +clap = "3.0.0-beta.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" env_logger = "0.9" diff --git a/youki_integration_test/Cargo.lock b/crates/integration_test/Cargo.lock similarity index 100% rename from youki_integration_test/Cargo.lock rename to crates/integration_test/Cargo.lock diff --git a/youki_integration_test/Cargo.toml b/crates/integration_test/Cargo.toml similarity index 81% rename from youki_integration_test/Cargo.toml rename to crates/integration_test/Cargo.toml index d2970a3a..711cd599 100644 --- a/youki_integration_test/Cargo.toml +++ b/crates/integration_test/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "youki_integration_test" +name = "integration_test" version = "0.1.0" edition = "2018" @@ -12,18 +12,13 @@ features = ["std", "suggestions", "derive"] version = "=3.0.0-beta.2" default-features = true -[workspace] -members = [ - "test_framework", -] - [dependencies] procfs = "0.11.0" uuid = "0.8" rand = "0.8.0" tar = "0.4" flate2 = "1.0" -test_framework = { path = "./test_framework"} +test_framework = { path = "../test_framework"} anyhow = "1.0" once_cell = "1.8.0" oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "3d5132a18c305be59d58187201429d8f0243b513" } diff --git a/youki_integration_test/README.md b/crates/integration_test/README.md similarity index 100% rename from youki_integration_test/README.md rename to crates/integration_test/README.md diff --git a/youki_integration_test/build.sh b/crates/integration_test/build.sh similarity index 100% rename from youki_integration_test/build.sh rename to crates/integration_test/build.sh diff --git a/youki_integration_test/bundle.tar.gz b/crates/integration_test/bundle.tar.gz similarity index 100% rename from youki_integration_test/bundle.tar.gz rename to crates/integration_test/bundle.tar.gz diff --git a/youki_integration_test/run_tests.sh b/crates/integration_test/run_tests.sh similarity index 100% rename from youki_integration_test/run_tests.sh rename to crates/integration_test/run_tests.sh diff --git a/youki_integration_test/src/lib.rs b/crates/integration_test/src/lib.rs similarity index 100% rename from youki_integration_test/src/lib.rs rename to crates/integration_test/src/lib.rs diff --git a/youki_integration_test/src/main.rs b/crates/integration_test/src/main.rs similarity index 100% rename from youki_integration_test/src/main.rs rename to crates/integration_test/src/main.rs diff --git a/youki_integration_test/src/tests/cgroups/blkio.rs b/crates/integration_test/src/tests/cgroups/blkio.rs similarity index 100% rename from youki_integration_test/src/tests/cgroups/blkio.rs rename to crates/integration_test/src/tests/cgroups/blkio.rs diff --git a/youki_integration_test/src/tests/cgroups/mod.rs b/crates/integration_test/src/tests/cgroups/mod.rs similarity index 100% rename from youki_integration_test/src/tests/cgroups/mod.rs rename to crates/integration_test/src/tests/cgroups/mod.rs diff --git a/youki_integration_test/src/tests/cgroups/pids.rs b/crates/integration_test/src/tests/cgroups/pids.rs similarity index 100% rename from youki_integration_test/src/tests/cgroups/pids.rs rename to crates/integration_test/src/tests/cgroups/pids.rs diff --git a/youki_integration_test/src/tests/lifecycle/container_create.rs b/crates/integration_test/src/tests/lifecycle/container_create.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/container_create.rs rename to crates/integration_test/src/tests/lifecycle/container_create.rs diff --git a/youki_integration_test/src/tests/lifecycle/container_lifecycle.rs b/crates/integration_test/src/tests/lifecycle/container_lifecycle.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/container_lifecycle.rs rename to crates/integration_test/src/tests/lifecycle/container_lifecycle.rs diff --git a/youki_integration_test/src/tests/lifecycle/create.rs b/crates/integration_test/src/tests/lifecycle/create.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/create.rs rename to crates/integration_test/src/tests/lifecycle/create.rs diff --git a/youki_integration_test/src/tests/lifecycle/delete.rs b/crates/integration_test/src/tests/lifecycle/delete.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/delete.rs rename to crates/integration_test/src/tests/lifecycle/delete.rs diff --git a/youki_integration_test/src/tests/lifecycle/kill.rs b/crates/integration_test/src/tests/lifecycle/kill.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/kill.rs rename to crates/integration_test/src/tests/lifecycle/kill.rs diff --git a/youki_integration_test/src/tests/lifecycle/mod.rs b/crates/integration_test/src/tests/lifecycle/mod.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/mod.rs rename to crates/integration_test/src/tests/lifecycle/mod.rs diff --git a/youki_integration_test/src/tests/lifecycle/start.rs b/crates/integration_test/src/tests/lifecycle/start.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/start.rs rename to crates/integration_test/src/tests/lifecycle/start.rs diff --git a/youki_integration_test/src/tests/lifecycle/state.rs b/crates/integration_test/src/tests/lifecycle/state.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/state.rs rename to crates/integration_test/src/tests/lifecycle/state.rs diff --git a/youki_integration_test/src/tests/lifecycle/util.rs b/crates/integration_test/src/tests/lifecycle/util.rs similarity index 100% rename from youki_integration_test/src/tests/lifecycle/util.rs rename to crates/integration_test/src/tests/lifecycle/util.rs diff --git a/youki_integration_test/src/tests/mod.rs b/crates/integration_test/src/tests/mod.rs similarity index 100% rename from youki_integration_test/src/tests/mod.rs rename to crates/integration_test/src/tests/mod.rs diff --git a/youki_integration_test/src/tests/pidfile/mod.rs b/crates/integration_test/src/tests/pidfile/mod.rs similarity index 100% rename from youki_integration_test/src/tests/pidfile/mod.rs rename to crates/integration_test/src/tests/pidfile/mod.rs diff --git a/youki_integration_test/src/tests/pidfile/pidfile_test.rs b/crates/integration_test/src/tests/pidfile/pidfile_test.rs similarity index 100% rename from youki_integration_test/src/tests/pidfile/pidfile_test.rs rename to crates/integration_test/src/tests/pidfile/pidfile_test.rs diff --git a/youki_integration_test/src/tests/tlb/mod.rs b/crates/integration_test/src/tests/tlb/mod.rs similarity index 100% rename from youki_integration_test/src/tests/tlb/mod.rs rename to crates/integration_test/src/tests/tlb/mod.rs diff --git a/youki_integration_test/src/tests/tlb/tlb_test.rs b/crates/integration_test/src/tests/tlb/tlb_test.rs similarity index 100% rename from youki_integration_test/src/tests/tlb/tlb_test.rs rename to crates/integration_test/src/tests/tlb/tlb_test.rs diff --git a/youki_integration_test/src/utils/mod.rs b/crates/integration_test/src/utils/mod.rs similarity index 100% rename from youki_integration_test/src/utils/mod.rs rename to crates/integration_test/src/utils/mod.rs diff --git a/youki_integration_test/src/utils/support.rs b/crates/integration_test/src/utils/support.rs similarity index 100% rename from youki_integration_test/src/utils/support.rs rename to crates/integration_test/src/utils/support.rs diff --git a/youki_integration_test/src/utils/temp_dir.rs b/crates/integration_test/src/utils/temp_dir.rs similarity index 100% rename from youki_integration_test/src/utils/temp_dir.rs rename to crates/integration_test/src/utils/temp_dir.rs diff --git a/youki_integration_test/src/utils/test_utils.rs b/crates/integration_test/src/utils/test_utils.rs similarity index 100% rename from youki_integration_test/src/utils/test_utils.rs rename to crates/integration_test/src/utils/test_utils.rs diff --git a/youki_integration_test/test_framework/Cargo.toml b/crates/test_framework/Cargo.toml similarity index 100% rename from youki_integration_test/test_framework/Cargo.toml rename to crates/test_framework/Cargo.toml diff --git a/youki_integration_test/test_framework/README.md b/crates/test_framework/README.md similarity index 100% rename from youki_integration_test/test_framework/README.md rename to crates/test_framework/README.md diff --git a/youki_integration_test/test_framework/src/conditional_test.rs b/crates/test_framework/src/conditional_test.rs similarity index 100% rename from youki_integration_test/test_framework/src/conditional_test.rs rename to crates/test_framework/src/conditional_test.rs diff --git a/youki_integration_test/test_framework/src/lib.rs b/crates/test_framework/src/lib.rs similarity index 100% rename from youki_integration_test/test_framework/src/lib.rs rename to crates/test_framework/src/lib.rs diff --git a/youki_integration_test/test_framework/src/test.rs b/crates/test_framework/src/test.rs similarity index 100% rename from youki_integration_test/test_framework/src/test.rs rename to crates/test_framework/src/test.rs diff --git a/youki_integration_test/test_framework/src/test_group.rs b/crates/test_framework/src/test_group.rs similarity index 100% rename from youki_integration_test/test_framework/src/test_group.rs rename to crates/test_framework/src/test_group.rs diff --git a/youki_integration_test/test_framework/src/test_manager.rs b/crates/test_framework/src/test_manager.rs similarity index 100% rename from youki_integration_test/test_framework/src/test_manager.rs rename to crates/test_framework/src/test_manager.rs diff --git a/youki_integration_test/test_framework/src/testable.rs b/crates/test_framework/src/testable.rs similarity index 100% rename from youki_integration_test/test_framework/src/testable.rs rename to crates/test_framework/src/testable.rs diff --git a/src/commands/create.rs b/src/commands/create.rs index aab0002a..27f387ea 100644 --- a/src/commands/create.rs +++ b/src/commands/create.rs @@ -22,7 +22,7 @@ pub struct Create { #[clap(long, default_value = "0")] preserve_fds: i32, /// name of the container instance to be started - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/delete.rs b/src/commands/delete.rs index 931342b9..1ad46605 100644 --- a/src/commands/delete.rs +++ b/src/commands/delete.rs @@ -6,7 +6,7 @@ use std::path::PathBuf; /// Release any resources held by the container #[derive(Clap, Debug)] pub struct Delete { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] container_id: String, /// forces deletion of the container if it is still running (using SIGKILL) #[clap(short, long)] diff --git a/src/commands/events.rs b/src/commands/events.rs index 1162c57e..8fde6788 100644 --- a/src/commands/events.rs +++ b/src/commands/events.rs @@ -15,7 +15,7 @@ pub struct Events { #[clap(long)] pub stats: bool, /// Name of the container instance - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/exec.rs b/src/commands/exec.rs index 7dd09593..41a3acf5 100644 --- a/src/commands/exec.rs +++ b/src/commands/exec.rs @@ -31,7 +31,7 @@ pub struct Exec { #[clap(short, long)] pub detach: bool, /// Identifier of the container - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, /// Command that should be executed in the container #[clap(required = false)] diff --git a/src/commands/kill.rs b/src/commands/kill.rs index 4a3b2c79..023260f7 100644 --- a/src/commands/kill.rs +++ b/src/commands/kill.rs @@ -9,7 +9,7 @@ use crate::{commands::load_container, signal::Signal}; /// Send the specified signal to the container #[derive(Clap, Debug)] pub struct Kill { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] container_id: String, signal: String, } diff --git a/src/commands/pause.rs b/src/commands/pause.rs index 057c5a75..48e39d93 100644 --- a/src/commands/pause.rs +++ b/src/commands/pause.rs @@ -8,7 +8,7 @@ use clap::Clap; /// Suspend the processes within the container #[derive(Clap, Debug)] pub struct Pause { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/ps.rs b/src/commands/ps.rs index a55692cf..1cdb81d3 100644 --- a/src/commands/ps.rs +++ b/src/commands/ps.rs @@ -10,7 +10,7 @@ pub struct Ps { /// format to display processes: table or json (default: "table") #[clap(short, long, default_value = "table")] format: String, - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, /// options will be passed to the ps utility #[clap(setting = clap::ArgSettings::Last)] diff --git a/src/commands/resume.rs b/src/commands/resume.rs index 8ac5b186..b36573b4 100644 --- a/src/commands/resume.rs +++ b/src/commands/resume.rs @@ -9,7 +9,7 @@ use crate::commands::load_container; /// Resume the processes within the container #[derive(Clap, Debug)] pub struct Resume { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/run.rs b/src/commands/run.rs index 05cbc507..0f2313d0 100644 --- a/src/commands/run.rs +++ b/src/commands/run.rs @@ -22,7 +22,7 @@ pub struct Run { #[clap(long, default_value = "0")] preserve_fds: i32, /// name of the container instance to be started - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/start.rs b/src/commands/start.rs index d638b495..74b631ec 100644 --- a/src/commands/start.rs +++ b/src/commands/start.rs @@ -10,7 +10,7 @@ use crate::commands::load_container; /// Start a previously created container #[derive(Clap, Debug)] pub struct Start { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/src/commands/state.rs b/src/commands/state.rs index 9e8caf76..28ea4d8c 100644 --- a/src/commands/state.rs +++ b/src/commands/state.rs @@ -9,7 +9,7 @@ use crate::container::Container; /// Show the container state #[derive(Clap, Debug)] pub struct State { - #[clap(forbid_empty_values = true, required = true)] + #[clap(required = true)] pub container_id: String, } diff --git a/youki_integration_test/.gitignore b/youki_integration_test/.gitignore deleted file mode 100644 index 90acd52b..00000000 --- a/youki_integration_test/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -youki_integration_test -*.log \ No newline at end of file