diff --git a/.github/workflows/paru.yml b/.github/workflows/paru.yml index 7b44d8ae..0ae8d500 100644 --- a/.github/workflows/paru.yml +++ b/.github/workflows/paru.yml @@ -36,7 +36,7 @@ jobs: run: cargo build --locked --features generate - name: Test - run: sudo -u nobody BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features generate,mock --target-dir=/tmp -- --test-threads=1 --nocapture + run: sudo -u nobody RUST_BACKTRACE=1 XDG_STATE_HOME=/tmp BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features generate,mock --target-dir=/tmp -- --test-threads=1 --nocapture test-git: runs-on: ubuntu-latest @@ -64,9 +64,5 @@ jobs: - name: Build run: cargo build --locked --features git,generate - - name: chown - run: | - chown -R nobody: . - - name: Test - run: sudo -u nobody BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features git,generate,mock --target-dir=/tmp -- --test-threads=1 --nocapture + run: sudo -u nobody XDG_STATE_HOME=/tmp BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features git,generate,mock --target-dir=/tmp -- --nocapture diff --git a/tests/common/mod.rs b/tests/common/mod.rs index dcd2f6fd..9ff31bba 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -13,7 +13,6 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let tmp = TempDir::new().unwrap(); let dir = tmp.path(); let testdata = Path::new(&var("CARGO_MANIFEST_DIR").unwrap()).join("testdata"); - println!("1"); let status = Command::new("cp") .arg("-rp") @@ -60,8 +59,7 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { } std::fs::create_dir_all(dir.join("cache/pkg"))?; - - std::fs::create_dir_all(testdata.join("pkg"))?; + let _ = std::fs::create_dir_all(testdata.join("pkg")); let mut file = fs::OpenOptions::new() .append(true) @@ -139,7 +137,6 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let mut path = std::env::var("PATH").unwrap(); path.push(':'); path.push_str(testdata.join("bin").to_str().unwrap()); - println!("4"); std::env::set_var("PACMAN", "true"); std::env::set_var("PACMAN_CONF", dir.join("pacman.conf")); @@ -178,12 +175,15 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let ret = paru::run(&args).await; assert_eq!(ret, 0); } - println!("5"); args.extend(run_args); let ret = paru::run(&args).await; - for pkg in std::fs::read_dir(dir.join("cache/pkg"))? { + for pkg in std::fs::read_dir(dir.join("cache/pkg")) + .ok() + .into_iter() + .flatten() + { let path = pkg?.path(); let name = path.file_name().unwrap().to_str().unwrap();