# HG changeset patch # User Paul Fisher # Date 1753912956 14400 # Node ID 6c75fb621b556a26677c5798b1497f3455b7d6c3 # Parent 9925fa14021bc8c6566cdecc4156aff1d13534a0 remove never-used test and switch to testing against features diff -r 9925fa14021b -r 6c75fb621b55 src/constants.rs --- a/src/constants.rs Wed Jul 30 18:00:14 2025 -0400 +++ b/src/constants.rs Wed Jul 30 18:02:36 2025 -0400 @@ -467,7 +467,7 @@ } #[test] - #[cfg(pam_impl = "Sun")] + #[cfg(feature = "sun-ext")] fn test_flags_sun() { assert_eq!( AuthtokFlags::NO_AUTHTOK_CHECK, diff -r 9925fa14021b -r 6c75fb621b55 testharness/tests/end2end.rs --- a/testharness/tests/end2end.rs Wed Jul 30 18:00:14 2025 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -#![cfg(feature = "test-install")] - -use std::any::Any; -use std::convert::Infallible; -use std::error::Error; -use std::io; -use std::panic::UnwindSafe; -use std::path::{Path, PathBuf}; -use std::{fs, panic}; - -const PAM_CONFIG: &str = "\ -auth required pam_testharness.so -account required pam_testharness.so -password required pam_testharness.so -session required pam_testharness.so -"; -const PAM_CONFIG_PATH: &str = "/etc/pam.d/testharness"; -const PAM_MODULE_PATH: &str = "/lib/security/pam_testharness.so"; - -#[derive(Debug, thiserror::Error)] -enum TestError { - #[error("error in test harness: {0}")] - HarnessError(#[from] io::Error), - #[error("panic in test: {0:?}")] - Panic(Box), - #[error(transparent)] - TestError(anyhow::Error), -} - -#[test] -fn test_auth_only() -> Result<(), TestError> { - harness(|| Ok::<(), Infallible>(())) -} - -fn harness( - test: impl Fn() -> Result<(), E> + UnwindSafe, -) -> Result<(), TestError> { - let dylib_path = test_cdylib::build_current_project(); - let module_path = Path::new(PAM_MODULE_PATH); - let config_path = Path::new(PAM_CONFIG_PATH); - let parent = module_path.parent().unwrap(); - fs::create_dir_all(parent)?; - fs::copy(dylib_path, module_path)?; - fs::write(config_path, PAM_CONFIG)?; - panic::catch_unwind(test) - .map_err(TestError::Panic)? - .map_err(|e| TestError::TestError(e.into()))?; - fs::remove_file(module_path)?; - fs::remove_file(config_path)?; - // If the /lib/security directory can't be removed, that's OK. - let _ = fs::remove_dir(parent); - Ok(()) -}