From 80f1f36ae900d84989571a3dd51c306658040d10 Mon Sep 17 00:00:00 2001 From: Yashodhan <54112038+YJDoc2@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:30:02 +0530 Subject: [PATCH] Refactor test dir structure (#2421) * Move individual rust-oci-tests components in the tests dir We can use several things from test_framework and even integration_test for additional tests such as podman rootless and wasm tests Signed-off-by: Yashodhan Joshi * fix scripts and docs for the new dir structure Signed-off-by: Yashodhan Joshi --------- Signed-off-by: Yashodhan Joshi --- .../workflows/integration_tests_validation.yaml | 4 +++- Cargo.toml | 2 +- docs/src/developer/e2e/integration_test.md | 2 +- docs/src/developer/e2e/runtimetest.md | 2 +- docs/src/developer/e2e/rust_oci_test.md | 14 +++++++------- docs/src/developer/e2e/test_framework.md | 2 +- docs/src/developer/runtimetest.md | 2 +- scripts/rust_integration_tests.sh | 2 +- tests/{rust-integration-tests => }/.gitignore | 0 .../integration_test/.gitignore | 0 .../integration_test/Cargo.toml | 4 ++-- .../integration_test/README.md | 0 .../integration_test/bundle.tar.gz | Bin .../integration_test/src/lib.rs | 0 .../integration_test/src/logger.rs | 0 .../integration_test/src/main.rs | 0 .../integration_test/src/tests/cgroups/blkio.rs | 0 .../integration_test/src/tests/cgroups/cpu/mod.rs | 0 .../integration_test/src/tests/cgroups/cpu/v1.rs | 0 .../integration_test/src/tests/cgroups/cpu/v2.rs | 0 .../integration_test/src/tests/cgroups/memory.rs | 0 .../integration_test/src/tests/cgroups/mod.rs | 0 .../integration_test/src/tests/cgroups/network.rs | 0 .../integration_test/src/tests/cgroups/pids.rs | 0 .../src/tests/example/hello_world.rs | 0 .../integration_test/src/tests/example/mod.rs | 0 .../integration_test/src/tests/hooks/invoke.rs | 0 .../integration_test/src/tests/hooks/mod.rs | 0 .../integration_test/src/tests/hostname/mod.rs | 0 .../src/tests/intel_rdt/intel_rdt_test.rs | 0 .../integration_test/src/tests/intel_rdt/mod.rs | 0 .../src/tests/lifecycle/checkpoint.rs | 0 .../src/tests/lifecycle/container_create.rs | 0 .../src/tests/lifecycle/container_lifecycle.rs | 0 .../src/tests/lifecycle/create.rs | 0 .../src/tests/lifecycle/delete.rs | 0 .../integration_test/src/tests/lifecycle/exec.rs | 0 .../integration_test/src/tests/lifecycle/kill.rs | 0 .../integration_test/src/tests/lifecycle/mod.rs | 0 .../integration_test/src/tests/lifecycle/start.rs | 0 .../integration_test/src/tests/lifecycle/state.rs | 0 .../integration_test/src/tests/lifecycle/util.rs | 0 .../src/tests/linux_ns_itype/mod.rs | 0 .../src/tests/linux_ns_itype/ns_itype_test.rs | 0 .../integration_test/src/tests/mod.rs | 0 .../src/tests/mounts_recursive/mod.rs | 4 ++-- .../integration_test/src/tests/pidfile/mod.rs | 0 .../src/tests/pidfile/pidfile_test.rs | 0 .../src/tests/readonly_paths/mod.rs | 0 .../tests/readonly_paths/readonly_paths_tests.rs | 0 .../src/tests/seccomp_notify/mod.rs | 0 .../src/tests/seccomp_notify/seccomp_agent.rs | 0 .../integration_test/src/tests/tlb/mod.rs | 0 .../integration_test/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/test_utils.rs | 0 .../runtimetest/.cargo/config.toml | 0 .../runtimetest/Cargo.toml | 0 .../runtimetest/README.md | 0 .../runtimetest/src/main.rs | 0 .../runtimetest/src/tests.rs | 0 .../runtimetest/src/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 71 files changed, 20 insertions(+), 18 deletions(-) rename tests/{rust-integration-tests => }/.gitignore (100%) rename tests/{rust-integration-tests => }/integration_test/.gitignore (100%) rename tests/{rust-integration-tests => }/integration_test/Cargo.toml (89%) rename tests/{rust-integration-tests => }/integration_test/README.md (100%) rename tests/{rust-integration-tests => }/integration_test/bundle.tar.gz (100%) rename tests/{rust-integration-tests => }/integration_test/src/lib.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/logger.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/main.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/blkio.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/cpu/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/cpu/v1.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/cpu/v2.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/memory.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/network.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/cgroups/pids.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/example/hello_world.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/example/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/hooks/invoke.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/hooks/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/hostname/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/intel_rdt/intel_rdt_test.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/intel_rdt/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/checkpoint.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/container_create.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/container_lifecycle.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/create.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/delete.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/exec.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/kill.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/start.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/state.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/lifecycle/util.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/linux_ns_itype/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/linux_ns_itype/ns_itype_test.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/mounts_recursive/mod.rs (99%) rename tests/{rust-integration-tests => }/integration_test/src/tests/pidfile/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/pidfile/pidfile_test.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/readonly_paths/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/readonly_paths/readonly_paths_tests.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/seccomp_notify/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/seccomp_notify/seccomp_agent.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/tlb/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/tests/tlb/tlb_test.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/utils/mod.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/utils/support.rs (100%) rename tests/{rust-integration-tests => }/integration_test/src/utils/test_utils.rs (100%) rename tests/{rust-integration-tests => }/runtimetest/.cargo/config.toml (100%) rename tests/{rust-integration-tests => }/runtimetest/Cargo.toml (100%) rename tests/{rust-integration-tests => }/runtimetest/README.md (100%) rename tests/{rust-integration-tests => }/runtimetest/src/main.rs (100%) rename tests/{rust-integration-tests => }/runtimetest/src/tests.rs (100%) rename tests/{rust-integration-tests => }/runtimetest/src/utils.rs (100%) rename tests/{rust-integration-tests => }/test_framework/Cargo.toml (100%) rename tests/{rust-integration-tests => }/test_framework/README.md (100%) rename tests/{rust-integration-tests => }/test_framework/src/conditional_test.rs (100%) rename tests/{rust-integration-tests => }/test_framework/src/lib.rs (100%) rename tests/{rust-integration-tests => }/test_framework/src/test.rs (100%) rename tests/{rust-integration-tests => }/test_framework/src/test_group.rs (100%) rename tests/{rust-integration-tests => }/test_framework/src/test_manager.rs (100%) rename tests/{rust-integration-tests => }/test_framework/src/testable.rs (100%) diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml index e2208784..c41c4801 100644 --- a/.github/workflows/integration_tests_validation.yaml +++ b/.github/workflows/integration_tests_validation.yaml @@ -22,7 +22,9 @@ jobs: with: files: | .github/workflows/integration_tests_validation.yaml - tests/rust-integration-tests/** + tests/runtimetest/** + tests/test_framework/** + tests/integration_test/** files_ignore: | **.md - name: List all changed files diff --git a/Cargo.toml b/Cargo.toml index 86d2aca2..842215cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["tests/rust-integration-tests/*", "crates/*", "tools/*"] +members = ["tests/runtimetest/","tests/integration_test/","tests/test_framework/","crates/*", "tools/*"] [profile.release] lto = true diff --git a/docs/src/developer/e2e/integration_test.md b/docs/src/developer/e2e/integration_test.md index 56ea6f47..25fe0bac 100644 --- a/docs/src/developer/e2e/integration_test.md +++ b/docs/src/developer/e2e/integration_test.md @@ -1,6 +1,6 @@ # integration_test -**Note** that these tests resides in `/tests/rust-integration-tests/integration_test/` at the time of writing. +**Note** that these tests resides in `/tests/integration_test/` at the time of writing. This crate contains the Rust port of OCI-runtime tools integration tests, which are used to test if the runtime works as per the OCI spec or not. Initially youki used the original implementation of these test provided in the OCI repository [here](https://github.com/opencontainers/runtime-tools/tree/master/validation). But those tests are written in Go, which made the developers depend on two language environments Rust and Go to compile youki and test it. The Validation tests themselves also have an optional dependency on node js to parse their output, which can make it a third language dependency. diff --git a/docs/src/developer/e2e/runtimetest.md b/docs/src/developer/e2e/runtimetest.md index 84273d47..bf45cb75 100644 --- a/docs/src/developer/e2e/runtimetest.md +++ b/docs/src/developer/e2e/runtimetest.md @@ -1,6 +1,6 @@ # Runtime Test -**Note** that these tests resides in /tests/rust-integration-tests/runtimetest at the time of writing. +**Note** that these tests resides in /tests/runtimetest at the time of writing. This crate provides a binary which is used by integration tests to verify that the restrictions and constraints applied to the container are upheld by the container process, from inside the container process. This runs the tests one-by-one, and the failing test prints the error to the stderr. diff --git a/docs/src/developer/e2e/rust_oci_test.md b/docs/src/developer/e2e/rust_oci_test.md index 212f6aa3..2853b0bd 100644 --- a/docs/src/developer/e2e/rust_oci_test.md +++ b/docs/src/developer/e2e/rust_oci_test.md @@ -19,7 +19,7 @@ We will not go into detail here, but will explain how to write and add a new tes

```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs}} +{{#include ../../../../tests/integration_test/src/tests/example/hello_world.rs}} ```

@@ -33,31 +33,31 @@ We will not go into detail here, but will explain how to write and add a new tes Therefore, it is common practice here to write an OCI Runtime Spec that executes `runtimetest`. ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs:get_example_spec}} +{{#include ../../../../tests/integration_test/src/tests/example/hello_world.rs:get_example_spec}} ``` 2. Prepare a function that returns a `TestResult`, which represents the result of the test. ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs:example_test}} +{{#include ../../../../tests/integration_test/src/tests/example/hello_world.rs:example_test}} ``` 3. Create a `TestGroup` and register a test case you created ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs:get_example_test}} +{{#include ../../../../tests/integration_test/src/tests/example/hello_world.rs:get_example_test}} ``` 4. Register the `TestGroup` you created to a `TestManager` ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/integration_test/src/main.rs:register_example_test}} +{{#include ../../../../tests/integration_test/src/main.rs:register_example_test}} ``` 5. Write the validation you want to run within a test container ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/runtimetest/src/main.rs:example_runtimetest_main}} +{{#include ../../../../tests/runtimetest/src/main.rs:example_runtimetest_main}} ``` ```rust,no_run,noplayground -{{#include ../../../../tests/rust-integration-tests/runtimetest/src/tests.rs:example_hello_world}} +{{#include ../../../../tests/runtimetest/src/tests.rs:example_hello_world}} ``` diff --git a/docs/src/developer/e2e/test_framework.md b/docs/src/developer/e2e/test_framework.md index 1c16e10f..c7ed80e0 100644 --- a/docs/src/developer/e2e/test_framework.md +++ b/docs/src/developer/e2e/test_framework.md @@ -1,6 +1,6 @@ # test_framework -**Note** that these tests resides in /tests/rust-integration-tests/test_framework at the time of writing. +**Note** that these tests resides in /tests/test_framework at the time of writing. This crate contains the testing framework specifically developed for porting the OCI integration test to rust. This contains structs to represent the individual tests, group of tests and a test manager that has responsibility to run tests. This Also exposes traits which can be used to implement custom test structs or test group structs if needed. diff --git a/docs/src/developer/runtimetest.md b/docs/src/developer/runtimetest.md index 84273d47..bf45cb75 100644 --- a/docs/src/developer/runtimetest.md +++ b/docs/src/developer/runtimetest.md @@ -1,6 +1,6 @@ # Runtime Test -**Note** that these tests resides in /tests/rust-integration-tests/runtimetest at the time of writing. +**Note** that these tests resides in /tests/runtimetest at the time of writing. This crate provides a binary which is used by integration tests to verify that the restrictions and constraints applied to the container are upheld by the container process, from inside the container process. This runs the tests one-by-one, and the failing test prints the error to the stderr. diff --git a/scripts/rust_integration_tests.sh b/scripts/rust_integration_tests.sh index 553ea440..3886f12c 100755 --- a/scripts/rust_integration_tests.sh +++ b/scripts/rust_integration_tests.sh @@ -20,7 +20,7 @@ ROOT=${2-$(git rev-parse --show-toplevel)} LOGFILE="${ROOT}/test.log" if [ ! -f ${ROOT}/bundle.tar.gz ]; then - cp ${ROOT}/tests/rust-integration-tests/integration_test/bundle.tar.gz ${ROOT}/bundle.tar.gz + cp ${ROOT}/tests/integration_test/bundle.tar.gz ${ROOT}/bundle.tar.gz fi touch ${LOGFILE} diff --git a/tests/rust-integration-tests/.gitignore b/tests/.gitignore similarity index 100% rename from tests/rust-integration-tests/.gitignore rename to tests/.gitignore diff --git a/tests/rust-integration-tests/integration_test/.gitignore b/tests/integration_test/.gitignore similarity index 100% rename from tests/rust-integration-tests/integration_test/.gitignore rename to tests/integration_test/.gitignore diff --git a/tests/rust-integration-tests/integration_test/Cargo.toml b/tests/integration_test/Cargo.toml similarity index 89% rename from tests/rust-integration-tests/integration_test/Cargo.toml rename to tests/integration_test/Cargo.toml index 09707ba5..5959278e 100644 --- a/tests/rust-integration-tests/integration_test/Cargo.toml +++ b/tests/integration_test/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" anyhow = "1.0" chrono = { version = "0.4", default-features = false, features = ["clock"] } flate2 = "1.0" -libcgroups = { path = "../../../crates/libcgroups" } -libcontainer = { path = "../../../crates/libcontainer" } +libcgroups = { path = "../../crates/libcgroups" } +libcontainer = { path = "../../crates/libcontainer" } nix = "0.27.1" num_cpus = "1.16" oci-spec = { version = "0.6.1", features = ["runtime"] } diff --git a/tests/rust-integration-tests/integration_test/README.md b/tests/integration_test/README.md similarity index 100% rename from tests/rust-integration-tests/integration_test/README.md rename to tests/integration_test/README.md diff --git a/tests/rust-integration-tests/integration_test/bundle.tar.gz b/tests/integration_test/bundle.tar.gz similarity index 100% rename from tests/rust-integration-tests/integration_test/bundle.tar.gz rename to tests/integration_test/bundle.tar.gz diff --git a/tests/rust-integration-tests/integration_test/src/lib.rs b/tests/integration_test/src/lib.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/lib.rs rename to tests/integration_test/src/lib.rs diff --git a/tests/rust-integration-tests/integration_test/src/logger.rs b/tests/integration_test/src/logger.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/logger.rs rename to tests/integration_test/src/logger.rs diff --git a/tests/rust-integration-tests/integration_test/src/main.rs b/tests/integration_test/src/main.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/main.rs rename to tests/integration_test/src/main.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/blkio.rs b/tests/integration_test/src/tests/cgroups/blkio.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/blkio.rs rename to tests/integration_test/src/tests/cgroups/blkio.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/mod.rs b/tests/integration_test/src/tests/cgroups/cpu/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/mod.rs rename to tests/integration_test/src/tests/cgroups/cpu/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/v1.rs b/tests/integration_test/src/tests/cgroups/cpu/v1.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/v1.rs rename to tests/integration_test/src/tests/cgroups/cpu/v1.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/v2.rs b/tests/integration_test/src/tests/cgroups/cpu/v2.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/v2.rs rename to tests/integration_test/src/tests/cgroups/cpu/v2.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/memory.rs b/tests/integration_test/src/tests/cgroups/memory.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/memory.rs rename to tests/integration_test/src/tests/cgroups/memory.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/mod.rs b/tests/integration_test/src/tests/cgroups/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/mod.rs rename to tests/integration_test/src/tests/cgroups/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/network.rs b/tests/integration_test/src/tests/cgroups/network.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/network.rs rename to tests/integration_test/src/tests/cgroups/network.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/pids.rs b/tests/integration_test/src/tests/cgroups/pids.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/cgroups/pids.rs rename to tests/integration_test/src/tests/cgroups/pids.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs b/tests/integration_test/src/tests/example/hello_world.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/example/hello_world.rs rename to tests/integration_test/src/tests/example/hello_world.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/example/mod.rs b/tests/integration_test/src/tests/example/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/example/mod.rs rename to tests/integration_test/src/tests/example/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/hooks/invoke.rs b/tests/integration_test/src/tests/hooks/invoke.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/hooks/invoke.rs rename to tests/integration_test/src/tests/hooks/invoke.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/hooks/mod.rs b/tests/integration_test/src/tests/hooks/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/hooks/mod.rs rename to tests/integration_test/src/tests/hooks/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/hostname/mod.rs b/tests/integration_test/src/tests/hostname/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/hostname/mod.rs rename to tests/integration_test/src/tests/hostname/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/intel_rdt/intel_rdt_test.rs b/tests/integration_test/src/tests/intel_rdt/intel_rdt_test.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/intel_rdt/intel_rdt_test.rs rename to tests/integration_test/src/tests/intel_rdt/intel_rdt_test.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/intel_rdt/mod.rs b/tests/integration_test/src/tests/intel_rdt/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/intel_rdt/mod.rs rename to tests/integration_test/src/tests/intel_rdt/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/checkpoint.rs b/tests/integration_test/src/tests/lifecycle/checkpoint.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/checkpoint.rs rename to tests/integration_test/src/tests/lifecycle/checkpoint.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_create.rs b/tests/integration_test/src/tests/lifecycle/container_create.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_create.rs rename to tests/integration_test/src/tests/lifecycle/container_create.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_lifecycle.rs b/tests/integration_test/src/tests/lifecycle/container_lifecycle.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_lifecycle.rs rename to tests/integration_test/src/tests/lifecycle/container_lifecycle.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/create.rs b/tests/integration_test/src/tests/lifecycle/create.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/create.rs rename to tests/integration_test/src/tests/lifecycle/create.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/delete.rs b/tests/integration_test/src/tests/lifecycle/delete.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/delete.rs rename to tests/integration_test/src/tests/lifecycle/delete.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/exec.rs b/tests/integration_test/src/tests/lifecycle/exec.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/exec.rs rename to tests/integration_test/src/tests/lifecycle/exec.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/kill.rs b/tests/integration_test/src/tests/lifecycle/kill.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/kill.rs rename to tests/integration_test/src/tests/lifecycle/kill.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/mod.rs b/tests/integration_test/src/tests/lifecycle/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/mod.rs rename to tests/integration_test/src/tests/lifecycle/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/start.rs b/tests/integration_test/src/tests/lifecycle/start.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/start.rs rename to tests/integration_test/src/tests/lifecycle/start.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/state.rs b/tests/integration_test/src/tests/lifecycle/state.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/state.rs rename to tests/integration_test/src/tests/lifecycle/state.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/util.rs b/tests/integration_test/src/tests/lifecycle/util.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/lifecycle/util.rs rename to tests/integration_test/src/tests/lifecycle/util.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/linux_ns_itype/mod.rs b/tests/integration_test/src/tests/linux_ns_itype/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/linux_ns_itype/mod.rs rename to tests/integration_test/src/tests/linux_ns_itype/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/linux_ns_itype/ns_itype_test.rs b/tests/integration_test/src/tests/linux_ns_itype/ns_itype_test.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/linux_ns_itype/ns_itype_test.rs rename to tests/integration_test/src/tests/linux_ns_itype/ns_itype_test.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/mod.rs b/tests/integration_test/src/tests/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/mod.rs rename to tests/integration_test/src/tests/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/mounts_recursive/mod.rs b/tests/integration_test/src/tests/mounts_recursive/mod.rs similarity index 99% rename from tests/rust-integration-tests/integration_test/src/tests/mounts_recursive/mod.rs rename to tests/integration_test/src/tests/mounts_recursive/mod.rs index 107ecab8..ba3f5b1e 100644 --- a/tests/rust-integration-tests/integration_test/src/tests/mounts_recursive/mod.rs +++ b/tests/integration_test/src/tests/mounts_recursive/mod.rs @@ -605,9 +605,9 @@ fn check_recursive_rsymfollow() -> TestResult { /// this mount test how to work? /// 1. Create mount_options based on the mount properties of the test -/// 2. Create OCI.Spec content, container one process is runtimetest,(runtimetest is cargo model, file path `tests/rust-integration-tests/runtimetest/`) +/// 2. Create OCI.Spec content, container one process is runtimetest,(runtimetest is cargo model, file path `tests/runtimetest/`) /// 3. inside container to check if the actual mount matches the spec, (spec https://man7.org/linux/man-pages/man2/mount_setattr.2.html), -/// eg. tests/rust-integration-tests/runtimetest/src/tests.rs +/// eg. tests/runtimetest/src/tests.rs pub fn get_mounts_recursive_test() -> TestGroup { let rro_test = Test::new("rro_test", Box::new(check_recursive_readonly)); let rnosuid_test = Test::new("rnosuid_test", Box::new(check_recursive_nosuid)); diff --git a/tests/rust-integration-tests/integration_test/src/tests/pidfile/mod.rs b/tests/integration_test/src/tests/pidfile/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/pidfile/mod.rs rename to tests/integration_test/src/tests/pidfile/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/pidfile/pidfile_test.rs b/tests/integration_test/src/tests/pidfile/pidfile_test.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/pidfile/pidfile_test.rs rename to tests/integration_test/src/tests/pidfile/pidfile_test.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/readonly_paths/mod.rs b/tests/integration_test/src/tests/readonly_paths/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/readonly_paths/mod.rs rename to tests/integration_test/src/tests/readonly_paths/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/readonly_paths/readonly_paths_tests.rs b/tests/integration_test/src/tests/readonly_paths/readonly_paths_tests.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/readonly_paths/readonly_paths_tests.rs rename to tests/integration_test/src/tests/readonly_paths/readonly_paths_tests.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/seccomp_notify/mod.rs b/tests/integration_test/src/tests/seccomp_notify/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/seccomp_notify/mod.rs rename to tests/integration_test/src/tests/seccomp_notify/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/seccomp_notify/seccomp_agent.rs b/tests/integration_test/src/tests/seccomp_notify/seccomp_agent.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/seccomp_notify/seccomp_agent.rs rename to tests/integration_test/src/tests/seccomp_notify/seccomp_agent.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/tlb/mod.rs b/tests/integration_test/src/tests/tlb/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/tlb/mod.rs rename to tests/integration_test/src/tests/tlb/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/tests/tlb/tlb_test.rs b/tests/integration_test/src/tests/tlb/tlb_test.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/tests/tlb/tlb_test.rs rename to tests/integration_test/src/tests/tlb/tlb_test.rs diff --git a/tests/rust-integration-tests/integration_test/src/utils/mod.rs b/tests/integration_test/src/utils/mod.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/utils/mod.rs rename to tests/integration_test/src/utils/mod.rs diff --git a/tests/rust-integration-tests/integration_test/src/utils/support.rs b/tests/integration_test/src/utils/support.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/utils/support.rs rename to tests/integration_test/src/utils/support.rs diff --git a/tests/rust-integration-tests/integration_test/src/utils/test_utils.rs b/tests/integration_test/src/utils/test_utils.rs similarity index 100% rename from tests/rust-integration-tests/integration_test/src/utils/test_utils.rs rename to tests/integration_test/src/utils/test_utils.rs diff --git a/tests/rust-integration-tests/runtimetest/.cargo/config.toml b/tests/runtimetest/.cargo/config.toml similarity index 100% rename from tests/rust-integration-tests/runtimetest/.cargo/config.toml rename to tests/runtimetest/.cargo/config.toml diff --git a/tests/rust-integration-tests/runtimetest/Cargo.toml b/tests/runtimetest/Cargo.toml similarity index 100% rename from tests/rust-integration-tests/runtimetest/Cargo.toml rename to tests/runtimetest/Cargo.toml diff --git a/tests/rust-integration-tests/runtimetest/README.md b/tests/runtimetest/README.md similarity index 100% rename from tests/rust-integration-tests/runtimetest/README.md rename to tests/runtimetest/README.md diff --git a/tests/rust-integration-tests/runtimetest/src/main.rs b/tests/runtimetest/src/main.rs similarity index 100% rename from tests/rust-integration-tests/runtimetest/src/main.rs rename to tests/runtimetest/src/main.rs diff --git a/tests/rust-integration-tests/runtimetest/src/tests.rs b/tests/runtimetest/src/tests.rs similarity index 100% rename from tests/rust-integration-tests/runtimetest/src/tests.rs rename to tests/runtimetest/src/tests.rs diff --git a/tests/rust-integration-tests/runtimetest/src/utils.rs b/tests/runtimetest/src/utils.rs similarity index 100% rename from tests/rust-integration-tests/runtimetest/src/utils.rs rename to tests/runtimetest/src/utils.rs diff --git a/tests/rust-integration-tests/test_framework/Cargo.toml b/tests/test_framework/Cargo.toml similarity index 100% rename from tests/rust-integration-tests/test_framework/Cargo.toml rename to tests/test_framework/Cargo.toml diff --git a/tests/rust-integration-tests/test_framework/README.md b/tests/test_framework/README.md similarity index 100% rename from tests/rust-integration-tests/test_framework/README.md rename to tests/test_framework/README.md diff --git a/tests/rust-integration-tests/test_framework/src/conditional_test.rs b/tests/test_framework/src/conditional_test.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/conditional_test.rs rename to tests/test_framework/src/conditional_test.rs diff --git a/tests/rust-integration-tests/test_framework/src/lib.rs b/tests/test_framework/src/lib.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/lib.rs rename to tests/test_framework/src/lib.rs diff --git a/tests/rust-integration-tests/test_framework/src/test.rs b/tests/test_framework/src/test.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/test.rs rename to tests/test_framework/src/test.rs diff --git a/tests/rust-integration-tests/test_framework/src/test_group.rs b/tests/test_framework/src/test_group.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/test_group.rs rename to tests/test_framework/src/test_group.rs diff --git a/tests/rust-integration-tests/test_framework/src/test_manager.rs b/tests/test_framework/src/test_manager.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/test_manager.rs rename to tests/test_framework/src/test_manager.rs diff --git a/tests/rust-integration-tests/test_framework/src/testable.rs b/tests/test_framework/src/testable.rs similarity index 100% rename from tests/rust-integration-tests/test_framework/src/testable.rs rename to tests/test_framework/src/testable.rs