diff --git a/crates/ipc/README.md b/crates/ipc/README.md index 8bcdbea66..5a0ca5c20 100644 --- a/crates/ipc/README.md +++ b/crates/ipc/README.md @@ -31,7 +31,7 @@ ## Schemas and fixtures -`schemas/instance-record.schema.json` and `schemas/link-record.schema.json` describe the stored records. `tests/schemas.rs` checks that each schema and its Rust type agree, and that the stored records in `tests/fixtures/` stay valid. +`schemas/instance-record.schema.json` and `schemas/link-record.schema.json` describe the stored records. `tests/it/schemas.rs` checks that each schema and its Rust type agree, and that the stored records in `tests/fixtures/` stay valid. ## Tests diff --git a/crates/ipc/tests/bulk.rs b/crates/ipc/tests/it/bulk.rs similarity index 100% rename from crates/ipc/tests/bulk.rs rename to crates/ipc/tests/it/bulk.rs diff --git a/crates/ipc/tests/connection_limits.rs b/crates/ipc/tests/it/connection_limits.rs similarity index 100% rename from crates/ipc/tests/connection_limits.rs rename to crates/ipc/tests/it/connection_limits.rs diff --git a/crates/ipc/tests/discovery.rs b/crates/ipc/tests/it/discovery.rs similarity index 95% rename from crates/ipc/tests/discovery.rs rename to crates/ipc/tests/it/discovery.rs index 7d9f4a05f..6efab2f41 100644 --- a/crates/ipc/tests/discovery.rs +++ b/crates/ipc/tests/it/discovery.rs @@ -35,7 +35,7 @@ fn sigkill_drops_the_record() { let _ = std::fs::remove_dir_all(&path); let runtime = RuntimeDir::at(&path).unwrap(); let exe = std::env::current_exe().unwrap(); - let child = Command::new(exe).args(["--exact", "hold_until_killed", "--test-threads=1"]).env("CRAFT_HOLD_DIR", &path).spawn().unwrap(); + let child = Command::new(exe).args(["--exact", "discovery::hold_until_killed", "--test-threads=1"]).env("CRAFT_HOLD_DIR", &path).spawn().unwrap(); let mut guard = HoldCleanup { dir: path.clone(), child: Some(child) }; let ready = runtime.path().join("ready"); let deadline = Instant::now() + Duration::from_secs(10); diff --git a/crates/ipc/tests/fetch.rs b/crates/ipc/tests/it/fetch.rs similarity index 100% rename from crates/ipc/tests/fetch.rs rename to crates/ipc/tests/it/fetch.rs diff --git a/crates/ipc/tests/hub.rs b/crates/ipc/tests/it/hub.rs similarity index 100% rename from crates/ipc/tests/hub.rs rename to crates/ipc/tests/it/hub.rs diff --git a/crates/ipc/tests/it/main.rs b/crates/ipc/tests/it/main.rs new file mode 100644 index 000000000..0d95587ab --- /dev/null +++ b/crates/ipc/tests/it/main.rs @@ -0,0 +1,12 @@ +mod bulk; +mod connection_limits; +mod discovery; +mod fetch; +mod hub; +mod native_roundtrip; +mod open_payload; +mod protocol; +mod provider_stall; +mod schemas; +mod security; +mod watch; diff --git a/crates/ipc/tests/native_roundtrip.rs b/crates/ipc/tests/it/native_roundtrip.rs similarity index 100% rename from crates/ipc/tests/native_roundtrip.rs rename to crates/ipc/tests/it/native_roundtrip.rs diff --git a/crates/ipc/tests/open_payload.rs b/crates/ipc/tests/it/open_payload.rs similarity index 100% rename from crates/ipc/tests/open_payload.rs rename to crates/ipc/tests/it/open_payload.rs diff --git a/crates/ipc/tests/protocol.rs b/crates/ipc/tests/it/protocol.rs similarity index 100% rename from crates/ipc/tests/protocol.rs rename to crates/ipc/tests/it/protocol.rs diff --git a/crates/ipc/tests/provider_stall.rs b/crates/ipc/tests/it/provider_stall.rs similarity index 100% rename from crates/ipc/tests/provider_stall.rs rename to crates/ipc/tests/it/provider_stall.rs diff --git a/crates/ipc/tests/schemas.rs b/crates/ipc/tests/it/schemas.rs similarity index 100% rename from crates/ipc/tests/schemas.rs rename to crates/ipc/tests/it/schemas.rs diff --git a/crates/ipc/tests/security.rs b/crates/ipc/tests/it/security.rs similarity index 100% rename from crates/ipc/tests/security.rs rename to crates/ipc/tests/it/security.rs diff --git a/crates/ipc/tests/watch.rs b/crates/ipc/tests/it/watch.rs similarity index 100% rename from crates/ipc/tests/watch.rs rename to crates/ipc/tests/it/watch.rs