From 33424e82cc6592c725467840f1c5f3c5e45f208e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 2 Oct 2026 16:38:10 +0200 Subject: [PATCH] refactor(conformance): consolidate the test suite workspace Signed-off-by: Evan Lezar --- .github/workflows/branch-checks.yml | 3 + AGENTS.md | 1 - CI.md | 8 ++ Cargo.lock | 11 --- TESTING.md | 5 ++ tasks/rust.toml | 4 + tasks/test.toml | 5 ++ tests/suites/conformance/Cargo.lock | 65 -------------- tests/suites/conformance/Cargo.toml | 31 ++++++- tests/suites/conformance/README.md | 86 +++++++++++++++++++ tests/suites/conformance/cli/Cargo.toml | 2 +- .../conformance/cli/tests/file_transfer.rs | 4 +- .../suites/conformance/support}/Cargo.toml | 18 ++-- .../conformance/support}/src/executor.rs | 0 .../suites/conformance/support}/src/lib.rs | 0 .../support}/src/scenarios/file_transfer.rs | 0 .../conformance/support}/src/scenarios/mod.rs | 0 .../support}/src/scenarios/policy_behavior.rs | 0 .../src/scenarios/sandbox_lifecycle.rs | 0 .../support}/src/scenarios/smoke.rs | 0 tests/suites/drivers/Cargo.lock | 65 -------------- tests/suites/drivers/podman/Cargo.toml | 2 +- .../provider-refresh/keycloak/Cargo.toml | 2 +- 23 files changed, 155 insertions(+), 157 deletions(-) create mode 100644 tests/suites/conformance/README.md rename {crates/openshell-conformance => tests/suites/conformance/support}/Cargo.toml (52%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/executor.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/lib.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/scenarios/file_transfer.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/scenarios/mod.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/scenarios/policy_behavior.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/scenarios/sandbox_lifecycle.rs (100%) rename {crates/openshell-conformance => tests/suites/conformance/support}/src/scenarios/smoke.rs (100%) diff --git a/.github/workflows/branch-checks.yml b/.github/workflows/branch-checks.yml index 780d6ddbd1..0fe5e90200 100644 --- a/.github/workflows/branch-checks.yml +++ b/.github/workflows/branch-checks.yml @@ -141,6 +141,7 @@ jobs: shell: nix develop -c bash -euo pipefail {0} run: | cargo fmt --all -- --check + cargo fmt --manifest-path tests/suites/conformance/Cargo.toml --all -- --check cargo fmt --manifest-path e2e/rust/Cargo.toml --all -- --check cargo fmt --manifest-path examples/governance-interceptor/Cargo.toml --all -- --check cargo fmt --manifest-path examples/supervisor-middleware-content-guard/Cargo.toml --all -- --check @@ -196,6 +197,7 @@ jobs: shell: nix develop -c bash -euo pipefail {0} run: | cargo clippy --locked --workspace --all-targets -- -D warnings + cargo clippy --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --all-targets -- -D warnings cargo clippy --locked --manifest-path e2e/rust/Cargo.toml --all-targets -- -D warnings cargo clippy --locked --manifest-path examples/governance-interceptor/Cargo.toml --all-targets -- -D warnings cargo clippy --locked --manifest-path examples/supervisor-middleware-content-guard/Cargo.toml --all-targets -- -D warnings @@ -235,6 +237,7 @@ jobs: OPENSHELL_TELEMETRY_ENABLED: "false" run: | cargo nextest run --locked --profile ci --workspace --features openshell-server/test-support + cargo nextest run --locked --config-file .config/nextest.toml --profile ci --manifest-path tests/suites/conformance/Cargo.toml --package openshell-conformance cargo nextest run --locked --config-file .config/nextest.toml --profile ci --manifest-path examples/supervisor-middleware-content-guard/Cargo.toml rust-build-modes: diff --git a/AGENTS.md b/AGENTS.md index c6af760499..9b3b48d609 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -22,7 +22,6 @@ Do not rely on this file for a full inventory. The detailed public and contribut | Path | Components | Purpose | |------|-----------|---------| | `crates/openshell-cli/` | CLI binary | User-facing command-line interface | -| `crates/openshell-conformance/` | CLI conformance library | Reusable driver-agnostic scenarios and command runner | | `crates/openshell-server/` | Gateway server | Control-plane API, sandbox lifecycle, auth boundary | | `crates/openshell-sandbox/` | Sandbox runtime | Capability-free workload launcher, process identity, and seccomp-mediated I/O | | `crates/openshell-supervisor/` | Supervisor runtime | Gateway session, policy evaluation, credentials, and upstream networking | diff --git a/CI.md b/CI.md index cb7121b2cf..fa8431378d 100644 --- a/CI.md +++ b/CI.md @@ -512,6 +512,14 @@ merge. Do not add the informational Actionlint, Zizmor, Dependency Review, or CodeQL jobs to the required status list while they remain in observation mode. +## Conformance source checks + +Branch Rust checks format and lint the separate +`tests/suites/conformance` workspace. The Rust test jobs run the +`openshell-conformance` support package with the CI nextest profile, without +a gateway. Gateway-backed CLI tests retain their driver E2E and installed-artifact +integration lanes; source unit-test jobs do not execute those entry points. + ## Nix download recovery Jobs that enter the development shell enable `prepare-shell: "true"` on diff --git a/Cargo.lock b/Cargo.lock index 5b169a43da..b0b217efcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4028,17 +4028,6 @@ dependencies = [ "url", ] -[[package]] -name = "openshell-conformance" -version = "0.0.0" -dependencies = [ - "rand 0.9.4", - "serde", - "serde_json", - "tempfile", - "tokio", -] - [[package]] name = "openshell-core" version = "0.0.0" diff --git a/TESTING.md b/TESTING.md index 570d135f5b..fb931bdf40 100644 --- a/TESTING.md +++ b/TESTING.md @@ -210,6 +210,11 @@ When more than one test needs this behavior, put the transport in the shared Rust e2e harness and require callers to use it instead of duplicating DNS, HTTP `Host`, TLS SNI, and mTLS handling. +The [conformance suite guide](tests/suites/conformance/README.md) describes its +layout, authoring, and execution. Shared runner code lives under +`tests/suites/conformance/support`, alongside the CLI entry points. Run +`mise run test:conformance-support` to validate the harness without a gateway. + Suites: - Common suite (`--features e2e`) - driver-neutral CLI behavior, sandbox lifecycle, sync, port forwarding, policy, and provider tests. diff --git a/tasks/rust.toml b/tasks/rust.toml index 32928b8f69..16a86afd20 100644 --- a/tasks/rust.toml +++ b/tasks/rust.toml @@ -12,6 +12,7 @@ description = "Check all Rust crates for errors" depends = ["rust:lockfiles:check"] run = [ "cargo check --workspace", + "cargo check --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --all-targets", "cargo check -p openshell-sandbox --all-targets --features perf-harness", ] run_windows = "powershell -NoProfile -ExecutionPolicy Bypass -File tasks/scripts/windows-msvc.ps1 check native" @@ -28,6 +29,7 @@ description = "Lint Rust code with Clippy (deny warnings)" depends = ["rust:lockfiles:check"] run = [ "cargo clippy --workspace --all-targets -- -D warnings", + "cargo clippy --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --all-targets -- -D warnings", "cargo clippy -p openshell-sandbox --all-targets --features perf-harness -- -D warnings", "cargo clippy --manifest-path e2e/rust/Cargo.toml --all-targets -- -D warnings", "cargo clippy --manifest-path examples/governance-interceptor/Cargo.toml --all-targets -- -D warnings", @@ -40,6 +42,7 @@ hide = true description = "Format Rust code" run = [ "cargo fmt --all", + "cargo fmt --manifest-path tests/suites/conformance/Cargo.toml --all", "cargo fmt --manifest-path e2e/rust/Cargo.toml --all", "cargo fmt --manifest-path examples/governance-interceptor/Cargo.toml --all", "cargo fmt --manifest-path examples/supervisor-middleware-content-guard/Cargo.toml --all", @@ -50,6 +53,7 @@ hide = true description = "Check Rust formatting" run = [ "cargo fmt --all -- --check", + "cargo fmt --manifest-path tests/suites/conformance/Cargo.toml --all -- --check", "cargo fmt --manifest-path e2e/rust/Cargo.toml --all -- --check", "cargo fmt --manifest-path examples/governance-interceptor/Cargo.toml --all -- --check", "cargo fmt --manifest-path examples/supervisor-middleware-content-guard/Cargo.toml --all -- --check", diff --git a/tasks/test.toml b/tasks/test.toml index 28be2d71f3..64aa731674 100644 --- a/tasks/test.toml +++ b/tasks/test.toml @@ -7,6 +7,7 @@ description = "Run all tests (Rust + Python + TypeScript SDK)" depends = [ "test:rust", + "test:conformance-support", "test:python", "sdk:ts:test", "test:sbom", @@ -274,3 +275,7 @@ description = "Test generated local gateway TOML without starting a runtime" run = "bash tasks/scripts/test-gateway-config.sh" run_windows = "echo Skipping test:gateway-config: Unix gateway scripts do not apply on Windows." hide = true + +["test:conformance-support"] +description = "Run conformance harness unit tests without a gateway" +run = "cargo test --locked --manifest-path tests/suites/conformance/Cargo.toml --package openshell-conformance" diff --git a/tests/suites/conformance/Cargo.lock b/tests/suites/conformance/Cargo.lock index 89d8c0d392..e037b4c79d 100644 --- a/tests/suites/conformance/Cargo.lock +++ b/tests/suites/conformance/Cargo.lock @@ -66,15 +66,6 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - [[package]] name = "memchr" version = "2.8.3" @@ -117,29 +108,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - [[package]] name = "pin-project-lite" version = "0.2.17" @@ -208,15 +176,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", -] - [[package]] name = "rustix" version = "1.1.5" @@ -230,12 +189,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" version = "1.0.229" @@ -289,22 +242,6 @@ dependencies = [ "libc", ] -[[package]] -name = "smallvec" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" - -[[package]] -name = "socket2" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" -dependencies = [ - "libc", - "windows-sys", -] - [[package]] name = "syn" version = "2.0.119" @@ -349,10 +286,8 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", "tokio-macros", "windows-sys", ] diff --git a/tests/suites/conformance/Cargo.toml b/tests/suites/conformance/Cargo.toml index 1c6b001096..768fe30c5b 100644 --- a/tests/suites/conformance/Cargo.toml +++ b/tests/suites/conformance/Cargo.toml @@ -3,4 +3,33 @@ [workspace] resolver = "2" -members = ["cli"] +members = ["cli", "support"] + +[workspace.lints.rust] +unsafe_code = "warn" +rust_2018_idioms = { level = "warn", priority = -1 } +trivial_casts = "warn" +trivial_numeric_casts = "warn" +unused_lifetimes = "warn" +unused_qualifications = "warn" + +[workspace.lints.clippy] +all = { level = "warn", priority = -1 } +pedantic = { level = "warn", priority = -1 } +nursery = { level = "warn", priority = -1 } + +# Allow certain pedantic lints that are too noisy +module_name_repetitions = "allow" +must_use_candidate = "allow" +missing_errors_doc = "allow" +missing_panics_doc = "allow" + +# Allow noisy nursery lints +significant_drop_tightening = "allow" # Often gives incorrect suggestions +missing_const_for_fn = "allow" # Too noisy for async code patterns + +# Allow noisy pedantic lints +too_many_lines = "allow" # Function length limits are subjective +needless_pass_by_value = "allow" # Common pattern in async handlers +ref_option = "allow" # Common pattern for optional references +missing_fields_in_debug = "allow" # Manual Debug impls often intentionally omit fields diff --git a/tests/suites/conformance/README.md b/tests/suites/conformance/README.md new file mode 100644 index 0000000000..91dbe1b415 --- /dev/null +++ b/tests/suites/conformance/README.md @@ -0,0 +1,86 @@ +# OpenShell conformance suite + +This workspace contains public-behavior scenarios and Cargo test entry points +that run against an already configured gateway. The CLI is the current client +interface; lifecycle, file transfer, and policy behavior define the test groups. + +## Layout + +- `cli/tests/`: gateway-backed Cargo tests grouped by behavior. +- `support/src/scenarios/`: scenario implementations and their assertions. +- `support/src/lib.rs`: CLI runner, bounded polling, diagnostics, resource cleanup, + and harness unit tests. +- `support/src/executor.rs`: process execution and the injected executor interface. + +The `openshell-conformance` support crate belongs to this test workspace. Driver +and feature suites may reuse its runner without becoming general conformance. +Product crates must not depend on it. + +## Run without a gateway + +Run harness unit tests: + +```shell +mise run test:conformance-support +``` + +Compile the gateway-backed entry points without executing them: + +```shell +cargo test --locked --manifest-path tests/suites/conformance/Cargo.toml \ + --package openshell-test-conformance-cli --no-run +``` + +Repository formatting, Clippy, and unit-test checks include this workspace. +Select the support package for unit tests; running every workspace test also +executes the gateway-backed cases. + +## Run against a prepared gateway + +Install, register, and select the gateway before starting the suite. Supply the +matching candidate CLI explicitly: + +```shell +OPENSHELL_BIN=/absolute/path/to/openshell \ + cargo test --locked --manifest-path tests/suites/conformance/Cargo.toml \ + --package openshell-test-conformance-cli --no-fail-fast -- \ + --test-threads=1 --nocapture +``` + +Use the same OpenShell revision for the suite, CLI, and gateway. The suite does +not install OpenShell, start a gateway, or select a compute driver. The target +must supply the workload image and tools used by the selected scenarios. Missing +CLI or gateway prerequisites fail the run rather than silently passing. + +Run one group with `--test file_transfer`, `--test lifecycle`, +`--test policy_advisor`, or `--test smoke`, before the `--` separator. A group or +individual-test filter exercises only part of the suite. + +The tmachine conformance testsuite runs these same entry points from the +nextest archive built by `build-openshell-conformance-test-archive`. See +[CI.md](../../../CI.md) for the implemented integration lanes and +[the test-guest guide](../../../nix/test-guest/README.md) for preparation +and artifact execution. Archive construction selects the CLI test package; +harness unit tests run separately in source checks. + +## Add or change a test + +Keep the expected public behavior, preconditions, resource mutations, and +assertions beside the scenario implementation. Add its Cargo entry point in the +behavior group it exercises. Preserve existing test names when moving code so +Cargo and nextest filters keep working. + +Use structured CLI output and sandbox operations for behavioral assertions. +Keep gateway provisioning, runtime inspection, and host-specific setup in their +own harness or driver suite. Use unique resource names, register resources before +creation, and call `OpenShellRunner::finish` even when the scenario fails so it +attempts cleanup. Cleanup failures must remain visible. Current policy-advisor +cases set the proposal setting on their own sandbox; the suite runs serially. + +[RFC 0016](https://github.com/NVIDIA/OpenShell/pull/3460) proposes the wider +strategy. This consolidation does not establish conformance qualification: +effective capability discovery, distinct unsupported/skipped/infrastructure +outcomes, and attributed completeness reporting remain follow-ups in +[#3954](https://github.com/NVIDIA/OpenShell/issues/3954). Cargo currently reports +ordinary test success or failure. Existing scenario coverage is preserved here; +this move does not provide new cross-driver admission evidence. diff --git a/tests/suites/conformance/cli/Cargo.toml b/tests/suites/conformance/cli/Cargo.toml index 5edcefe687..fee8f4b5aa 100644 --- a/tests/suites/conformance/cli/Cargo.toml +++ b/tests/suites/conformance/cli/Cargo.toml @@ -10,5 +10,5 @@ license = "Apache-2.0" repository = "https://github.com/NVIDIA/OpenShell" [dependencies] -openshell-conformance = { path = "../../../../crates/openshell-conformance" } +openshell-conformance = { path = "../support" } tokio = { version = "1.43", features = ["macros", "rt"] } diff --git a/tests/suites/conformance/cli/tests/file_transfer.rs b/tests/suites/conformance/cli/tests/file_transfer.rs index 167506b87b..13421a588f 100644 --- a/tests/suites/conformance/cli/tests/file_transfer.rs +++ b/tests/suites/conformance/cli/tests/file_transfer.rs @@ -27,8 +27,8 @@ async fn path_safety() { } async fn run(scenario: Scenario) { - let mut runner = OpenShellRunner::from_env(scenario.name) - .expect("candidate openshell CLI is available"); + let mut runner = + OpenShellRunner::from_env(scenario.name).expect("candidate openshell CLI is available"); let result = async { runner.check_gateway_status().await?; scenario.run(&mut runner).await diff --git a/crates/openshell-conformance/Cargo.toml b/tests/suites/conformance/support/Cargo.toml similarity index 52% rename from crates/openshell-conformance/Cargo.toml rename to tests/suites/conformance/support/Cargo.toml index fbe777a7aa..cffba086cf 100644 --- a/crates/openshell-conformance/Cargo.toml +++ b/tests/suites/conformance/support/Cargo.toml @@ -4,18 +4,18 @@ [package] name = "openshell-conformance" description = "Reusable OpenShell CLI conformance scenarios and runner" -version.workspace = true -edition.workspace = true -rust-version.workspace = true -license.workspace = true -repository.workspace = true +version = "0.0.0" +edition = "2024" +rust-version = "1.94" +license = "Apache-2.0" +repository = "https://github.com/NVIDIA/OpenShell" [dependencies] -rand.workspace = true -serde.workspace = true -serde_json.workspace = true +rand = "0.9" +serde = { version = "1", features = ["derive"] } +serde_json = "1" tempfile = "3" -tokio.workspace = true +tokio = { version = "1.43", features = ["macros", "process", "rt", "time"] } [lints] workspace = true diff --git a/crates/openshell-conformance/src/executor.rs b/tests/suites/conformance/support/src/executor.rs similarity index 100% rename from crates/openshell-conformance/src/executor.rs rename to tests/suites/conformance/support/src/executor.rs diff --git a/crates/openshell-conformance/src/lib.rs b/tests/suites/conformance/support/src/lib.rs similarity index 100% rename from crates/openshell-conformance/src/lib.rs rename to tests/suites/conformance/support/src/lib.rs diff --git a/crates/openshell-conformance/src/scenarios/file_transfer.rs b/tests/suites/conformance/support/src/scenarios/file_transfer.rs similarity index 100% rename from crates/openshell-conformance/src/scenarios/file_transfer.rs rename to tests/suites/conformance/support/src/scenarios/file_transfer.rs diff --git a/crates/openshell-conformance/src/scenarios/mod.rs b/tests/suites/conformance/support/src/scenarios/mod.rs similarity index 100% rename from crates/openshell-conformance/src/scenarios/mod.rs rename to tests/suites/conformance/support/src/scenarios/mod.rs diff --git a/crates/openshell-conformance/src/scenarios/policy_behavior.rs b/tests/suites/conformance/support/src/scenarios/policy_behavior.rs similarity index 100% rename from crates/openshell-conformance/src/scenarios/policy_behavior.rs rename to tests/suites/conformance/support/src/scenarios/policy_behavior.rs diff --git a/crates/openshell-conformance/src/scenarios/sandbox_lifecycle.rs b/tests/suites/conformance/support/src/scenarios/sandbox_lifecycle.rs similarity index 100% rename from crates/openshell-conformance/src/scenarios/sandbox_lifecycle.rs rename to tests/suites/conformance/support/src/scenarios/sandbox_lifecycle.rs diff --git a/crates/openshell-conformance/src/scenarios/smoke.rs b/tests/suites/conformance/support/src/scenarios/smoke.rs similarity index 100% rename from crates/openshell-conformance/src/scenarios/smoke.rs rename to tests/suites/conformance/support/src/scenarios/smoke.rs diff --git a/tests/suites/drivers/Cargo.lock b/tests/suites/drivers/Cargo.lock index 6b013452fe..67bacf54c4 100644 --- a/tests/suites/drivers/Cargo.lock +++ b/tests/suites/drivers/Cargo.lock @@ -66,15 +66,6 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - [[package]] name = "memchr" version = "2.8.3" @@ -118,29 +109,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - [[package]] name = "pin-project-lite" version = "0.2.17" @@ -209,15 +177,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", -] - [[package]] name = "rustix" version = "1.1.5" @@ -231,12 +190,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" version = "1.0.229" @@ -290,22 +243,6 @@ dependencies = [ "libc", ] -[[package]] -name = "smallvec" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" - -[[package]] -name = "socket2" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" -dependencies = [ - "libc", - "windows-sys", -] - [[package]] name = "syn" version = "2.0.119" @@ -350,10 +287,8 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", "tokio-macros", "windows-sys", ] diff --git a/tests/suites/drivers/podman/Cargo.toml b/tests/suites/drivers/podman/Cargo.toml index 1a06b69e8d..87755ff1a7 100644 --- a/tests/suites/drivers/podman/Cargo.toml +++ b/tests/suites/drivers/podman/Cargo.toml @@ -10,6 +10,6 @@ license = "Apache-2.0" repository = "https://github.com/NVIDIA/OpenShell" [dependencies] -openshell-conformance = { path = "../../../../crates/openshell-conformance" } +openshell-conformance = { path = "../../conformance/support" } serde = { version = "1", features = ["derive"] } tokio = { version = "1.43", features = ["macros", "rt"] } diff --git a/tests/suites/features/provider-refresh/keycloak/Cargo.toml b/tests/suites/features/provider-refresh/keycloak/Cargo.toml index f42a1c8bd7..f287af2691 100644 --- a/tests/suites/features/provider-refresh/keycloak/Cargo.toml +++ b/tests/suites/features/provider-refresh/keycloak/Cargo.toml @@ -7,7 +7,7 @@ version = "0.0.0" edition = "2024" [dependencies] -openshell-conformance = { path = "../../../../../crates/openshell-conformance" } +openshell-conformance = { path = "../../../conformance/support" } openshell-e2e = { path = "../../../../../e2e/rust" } serde_json = "1" tempfile = "3"