Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ members = [
"crates/perry-ext-ads",
"crates/perry-wasm-host",
"crates/perry-container-compose",
"crates/perry-container-e2e",
"crates/perry-stdlib",
"crates/perry-diagnostics",
"crates/perry-ui",
Expand Down
15 changes: 7 additions & 8 deletions crates/perry-container-e2e/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,11 @@ pub struct E2eResult {
/// per-test `extra_env` to set `PERRY_E2E_PORT` etc.
pub fn run_e2e(name: &str, extra_env: &[(&str, &str)]) -> E2eResult {
let root = workspace_root();
let src = root.join("tests").join("e2e").join(format!("{}.e2e.ts", name));
assert!(
src.exists(),
"missing e2e source: {}",
src.display()
);
let src = root
.join("tests")
.join("e2e")
.join(format!("{}.e2e.ts", name));
assert!(src.exists(), "missing e2e source: {}", src.display());

// Compile to a per-test binary in a tmp subdir so parallel runs
// (if a future user disables --test-threads=1) don't clobber.
Expand All @@ -94,8 +93,8 @@ pub fn run_e2e(name: &str, extra_env: &[(&str, &str)]) -> E2eResult {
}

// Run with a 5-minute walltime ceiling (image pulls can be slow).
let run = run_with_timeout(&bin_path, extra_env, Duration::from_secs(300))
.expect("run e2e binary");
let run =
run_with_timeout(&bin_path, extra_env, Duration::from_secs(300)).expect("run e2e binary");

E2eResult {
exit_code: run.0,
Expand Down
4 changes: 3 additions & 1 deletion crates/perry-container-e2e/tests/e2e_container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ fn e2e_redis_smoke() {
eprintln!("[skipped] PERRY_E2E_TESTS=1 not set");
return;
}
let port = std::process::id().to_string()[..5].parse::<u16>().unwrap_or(57399);
let port = std::process::id().to_string()[..5]
.parse::<u16>()
.unwrap_or(57399);
let port_str = port.to_string();
let result = run_e2e("redis-smoke", &[("PERRY_E2E_PORT", port_str.as_str())]);
assert_e2e_pass("redis-smoke", &result);
Expand Down
Loading