From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BEFE91FF14C for ; Fri, 29 May 2026 15:40:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09BB4C37A; Fri, 29 May 2026 15:40:00 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager 4/6] task cache: tests: add 'make_cache' convenience helper Date: Fri, 29 May 2026 15:39:49 +0200 Message-ID: <20260529133951.326103-5-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260529133951.326103-1-l.wagner@proxmox.com> References: <20260529133951.326103-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780061964717 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 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 Message-ID-Hash: ZE5BYB4IIBZJ6Q3HCLPE5AWUG2V3ZMUU X-Message-ID-Hash: ZE5BYB4IIBZJ6Q3HCLPE5AWUG2V3ZMUU X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Most test use similar settings for instantiating the task cache, so it makes sense to break it out into a helper. Signed-off-by: Lukas Wagner --- server/src/remote_tasks/task_cache.rs | 71 +++++++++------------------ 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/server/src/remote_tasks/task_cache.rs b/server/src/remote_tasks/task_cache.rs index 7da92e31..e83a351b 100644 --- a/server/src/remote_tasks/task_cache.rs +++ b/server/src/remote_tasks/task_cache.rs @@ -1310,8 +1310,7 @@ mod tests { const DEFAULT_MAX_SIZE: u64 = 10000; - #[test] - fn test_add_tasks() -> Result<(), Error> { + fn make_cache() -> Result<(NamedTempDir, TaskCache), Error> { let tmp_dir = NamedTempDir::new()?; let cache = TaskCache::new( tmp_dir.path(), @@ -1321,8 +1320,15 @@ mod tests { 0, DEFAULT_MAX_SIZE, ) - .unwrap() - .write()?; + .unwrap(); + + Ok((tmp_dir, cache)) + } + + #[test] + fn test_add_tasks() -> Result<(), Error> { + let (_tmp_dir, cache) = make_cache().unwrap(); + let cache = cache.write().unwrap(); cache.new_file(1000, false)?; assert_eq!(cache.cache.archive_files(&cache.lock)?.len(), 1); @@ -1374,17 +1380,8 @@ mod tests { #[test] fn test_active_tasks_are_migrated_to_archive() -> Result<(), Error> { - let tmp_dir = NamedTempDir::new()?; - let cache = TaskCache::new( - tmp_dir.path(), - CreateOptions::new(), - 3, - 1, - 0, - DEFAULT_MAX_SIZE, - ) - .unwrap() - .write()?; + let (_tmp_dir, cache) = make_cache().unwrap(); + let cache = cache.write().unwrap(); cache.new_file(1000, false)?; add_tasks(&cache, vec![task(1000, None), task(1001, None)])?; @@ -1401,17 +1398,9 @@ mod tests { #[test] fn test_init() -> Result<(), Error> { - let tmp_dir = NamedTempDir::new()?; - let cache = TaskCache::new( - tmp_dir.path(), - CreateOptions::new(), - 3, - 1, - 100, - DEFAULT_MAX_SIZE, - ) - .unwrap() - .write()?; + let (_tmp_dir, mut cache) = make_cache().unwrap(); + cache.rotate_after = 100; + let cache = cache.write().unwrap(); cache.init(1000)?; assert_eq!(cache.cache.archive_files(&cache.lock)?.len(), 3); @@ -1442,17 +1431,9 @@ mod tests { #[test] fn test_tracking_tasks() -> Result<(), Error> { - let tmp_dir = NamedTempDir::new()?; - let cache = TaskCache::new( - tmp_dir.path(), - CreateOptions::new(), - 3, - 1, - 100, - DEFAULT_MAX_SIZE, - ) - .unwrap() - .write()?; + let (_tmp_dir, mut cache) = make_cache().unwrap(); + cache.rotate_after = 100; + let cache = cache.write().unwrap(); cache.init(1000)?; @@ -1483,22 +1464,14 @@ mod tests { #[test] fn journal_is_applied_if_max_size_exceeded() -> Result<(), Error> { - let tmp_dir = NamedTempDir::new()?; - // Should be *just* enough to fit a single task, which means that we apply the journal // after adding a second one. const ENOUGH_FOR_SINGLE_TASK: u64 = 200; - let cache = TaskCache::new( - tmp_dir.path(), - CreateOptions::new(), - 3, - 1, - 100, - ENOUGH_FOR_SINGLE_TASK, - ) - .unwrap() - .write()?; + let (_tmp_dir, mut cache) = make_cache().unwrap(); + cache.rotate_after = 100; + cache.journal_max_size = ENOUGH_FOR_SINGLE_TASK; + let cache = cache.write().unwrap(); add_tasks(&cache, vec![task(1000, Some(1010))])?; assert!(cache.journal_size()? > 0); -- 2.47.3