Tests now have their own context, so requiring pve-context is not necessary any more.
Signed-off-by: Lukas Wagner <l.wag...@proxmox.com> Tested-by: Folke Gleumes <f.gleu...@proxmox.com> --- proxmox-notify/src/api/gotify.rs | 2 +- proxmox-notify/src/api/matcher.rs | 2 +- proxmox-notify/src/api/sendmail.rs | 2 +- proxmox-notify/src/api/smtp.rs | 24 ++++++++++++------------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/proxmox-notify/src/api/gotify.rs b/proxmox-notify/src/api/gotify.rs index 15d94cb..92151f5 100644 --- a/proxmox-notify/src/api/gotify.rs +++ b/proxmox-notify/src/api/gotify.rs @@ -165,7 +165,7 @@ fn remove_private_config_entry(config: &mut Config, name: &str) -> Result<(), Ht Ok(()) } -#[cfg(all(feature = "pve-context", test))] +#[cfg(test)] mod tests { use super::*; use crate::api::test_helpers::empty_config; diff --git a/proxmox-notify/src/api/matcher.rs b/proxmox-notify/src/api/matcher.rs index 63ec73d..fa11633 100644 --- a/proxmox-notify/src/api/matcher.rs +++ b/proxmox-notify/src/api/matcher.rs @@ -148,7 +148,7 @@ pub fn delete_matcher(config: &mut Config, name: &str) -> Result<(), HttpError> Ok(()) } -#[cfg(all(test, feature = "sendmail", feature = "pve-context"))] +#[cfg(all(test, feature = "sendmail"))] mod tests { use super::*; use crate::matcher::MatchModeOperator; diff --git a/proxmox-notify/src/api/sendmail.rs b/proxmox-notify/src/api/sendmail.rs index c20a3e5..47588af 100644 --- a/proxmox-notify/src/api/sendmail.rs +++ b/proxmox-notify/src/api/sendmail.rs @@ -151,7 +151,7 @@ pub fn delete_endpoint(config: &mut Config, name: &str) -> Result<(), HttpError> Ok(()) } -#[cfg(all(feature = "pve-context", test))] +#[cfg(test)] pub mod tests { use super::*; use crate::api::test_helpers::*; diff --git a/proxmox-notify/src/api/smtp.rs b/proxmox-notify/src/api/smtp.rs index 7a58677..1b4700e 100644 --- a/proxmox-notify/src/api/smtp.rs +++ b/proxmox-notify/src/api/smtp.rs @@ -200,7 +200,7 @@ pub fn delete_endpoint(config: &mut Config, name: &str) -> Result<(), HttpError> Ok(()) } -#[cfg(all(feature = "pve-context", test))] +#[cfg(test)] pub mod tests { use super::*; use crate::api::test_helpers::*; @@ -348,15 +348,15 @@ pub mod tests { Ok(()) } - // #[test] - // fn test_delete() -> Result<(), HttpError> { - // let mut config = empty_config(); - // add_smtp_endpoint_for_test(&mut config, "smtp-endpoint")?; - // - // delete_endpoint(&mut config, "smtp-endpoint")?; - // assert!(delete_endpoint(&mut config, "smtp-endpoint").is_err()); - // assert_eq!(get_endpoints(&config)?.len(), 0); - // - // Ok(()) - // } + #[test] + fn test_delete() -> Result<(), HttpError> { + let mut config = empty_config(); + add_smtp_endpoint_for_test(&mut config, "smtp-endpoint")?; + + delete_endpoint(&mut config, "smtp-endpoint")?; + assert!(delete_endpoint(&mut config, "smtp-endpoint").is_err()); + assert_eq!(get_endpoints(&config)?.len(), 0); + + Ok(()) + } } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel