From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0F43793BAE for ; Tue, 9 Apr 2024 15:26:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E4FBE1EFAB for ; Tue, 9 Apr 2024 15:26:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Apr 2024 15:26:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 148FD42309 for ; Tue, 9 Apr 2024 15:26:03 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 9 Apr 2024 15:25:40 +0200 Message-Id: <20240409132555.364926-5-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240409132555.364926-1-l.wagner@proxmox.com> References: <20240409132555.364926-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [matcher.rs, smtp.rs, gotify.rs, sendmail.rs] Subject: [pve-devel] [PATCH proxmox 04/19] notify: don't make tests require pve-context X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2024 13:26:34 -0000 Tests now have their own context, so requiring pve-context is not necessary any more. Signed-off-by: Lukas Wagner Tested-by: Folke Gleumes --- 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