diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83c0f25..906cd1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: "$PY" -m pip install -r engine/requirements.txt pyftpdlib cp tests/fake_ps5.py "$S/" python engine/make_fake_dump.py "$S/fakedump/PPSA00001-app" - echo "PACKER_E2E_SCRATCH=$S" >> "$GITHUB_ENV" + echo "PROSPACK_E2E_SCRATCH=$S" >> "$GITHUB_ENV" echo "PROSPACK_ENGINE=$(cd src-tauri/binaries && pwd)/$(ls src-tauri/binaries | head -1)" >> "$GITHUB_ENV" - name: App tests (unit + end-to-end) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ceab841..703862f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: "$PY" -m pip install -r engine/requirements.txt pyftpdlib cp tests/fake_ps5.py "$S/" python engine/make_fake_dump.py "$S/fakedump/PPSA00001-app" - export PACKER_E2E_SCRATCH="$S" + export PROSPACK_E2E_SCRATCH="$S" export PROSPACK_ENGINE="$(cd src-tauri/binaries && pwd)/$(ls src-tauri/binaries | head -1)" cargo test --manifest-path src-tauri/Cargo.toml -- --include-ignored --skip discover_lan diff --git a/.gitignore b/.gitignore index aab93d9..3968dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ public/mock/ src-tauri/binaries/ installer/src-tauri/payload/ *.bak +__pycache__/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8551fa3..50cc40c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,7 +42,7 @@ fake PS5. They never touch a real console. They need a scratch folder containing - `fakedump/PPSA00001-app`: from `python engine/make_fake_dump.py /fakedump/PPSA00001-app`. ```bash -PACKER_E2E_SCRATCH= PROSPACK_ENGINE=$PWD/binaries/prospack-engine- cargo test -- --include-ignored +PROSPACK_E2E_SCRATCH= PROSPACK_ENGINE=$PWD/binaries/prospack-engine- cargo test -- --include-ignored ``` The scenarios covered are: diff --git a/src-tauri/src/engine.rs b/src-tauri/src/engine.rs index b9232c5..f5cdc99 100644 --- a/src-tauri/src/engine.rs +++ b/src-tauri/src/engine.rs @@ -508,12 +508,12 @@ mod tests { mod cancel_test { use super::*; - /// PACKER_E2E_SCRATCH= cargo test cancel -- --ignored + /// PROSPACK_E2E_SCRATCH= cargo test cancel -- --ignored #[test] #[ignore] #[cfg(unix)] fn cancel_kills_mkpfs_promptly() { - let scratch = PathBuf::from(std::env::var("PACKER_E2E_SCRATCH").unwrap()); + let scratch = PathBuf::from(std::env::var("PROSPACK_E2E_SCRATCH").unwrap()); let tmp = tempfile::tempdir().unwrap(); let root = tmp.path().join("engine"); std::fs::create_dir_all(&root).unwrap(); diff --git a/src-tauri/src/pipeline.rs b/src-tauri/src/pipeline.rs index 63f97ee..e2f4f94 100644 --- a/src-tauri/src/pipeline.rs +++ b/src-tauri/src/pipeline.rs @@ -871,7 +871,7 @@ mod tests { } /// End-to-end run against a local fake PS5 (FTP + fake ShadowMountPlus). Never touches a real -/// console. Run with: PACKER_E2E_SCRATCH= cargo test e2e -- --ignored +/// console. Run with: PROSPACK_E2E_SCRATCH= cargo test e2e -- --ignored #[cfg(test)] mod e2e { use super::*; @@ -903,7 +903,7 @@ mod e2e { #[test] #[ignore] fn e2e_local_fake_ps5() { - let scratch = PathBuf::from(std::env::var("PACKER_E2E_SCRATCH").expect("PACKER_E2E_SCRATCH")); + let scratch = PathBuf::from(std::env::var("PROSPACK_E2E_SCRATCH").expect("PROSPACK_E2E_SCRATCH")); let tmp = tempfile::tempdir().unwrap(); std::env::set_var("PROSPACK_CONFIG_DIR", tmp.path().join("config")); std::env::set_var("PROSPACK_DATA_DIR", tmp.path().join("data"));