From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 999811FF15E
for <inbox@lore.proxmox.com>; Tue, 28 Jan 2025 13:26:27 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BE3A8CE3B;
Tue, 28 Jan 2025 13:26:25 +0100 (CET)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Tue, 28 Jan 2025 13:25:18 +0100
Message-Id: <20250128122520.167796-14-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250128122520.167796-1-l.wagner@proxmox.com>
References: <20250128122520.167796-1-l.wagner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.015 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
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 13/15] task cache:
tests: improve test coverage
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
<pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>
Adds some further trivial checks to improve coverage.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
server/src/remote_tasks/task_cache.rs | 40 +++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/server/src/remote_tasks/task_cache.rs b/server/src/remote_tasks/task_cache.rs
index e08e3d4..49164cb 100644
--- a/server/src/remote_tasks/task_cache.rs
+++ b/server/src/remote_tasks/task_cache.rs
@@ -289,6 +289,13 @@ mod tests {
tasks.reverse();
assert_eq!(tasks, res);
+ assert_eq!(cache.get_last_fetched("some-remote"), Some(0));
+ assert_eq!(cache.get_most_recent_starttime("some-remote").unwrap(), now);
+
+ assert!(cache.get_tasks("other-remote").is_none());
+ assert!(cache.get_last_fetched("other-remote").is_none());
+ assert!(cache.get_most_recent_starttime("other-remote").is_none());
+
Ok(())
}
@@ -322,4 +329,37 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn merge_tasks_2() -> Result<(), Error> {
+ // Pretty much identical to the other test, but try
+ // to trigger different edge-cases in the merge iterator.
+
+ // Arrange
+ let mut a = Vec::new();
+ for i in [30, 10, 20, 5] {
+ a.push(make_upid(i, None, None)?);
+ }
+
+ let mut b = Vec::new();
+ for i in [25, 15] {
+ b.push(make_upid(i, None, None)?);
+ }
+ a.push(make_upid(40, Some(50), Some("some status".into()))?);
+ b.push(make_upid(40, None, None)?);
+
+ // Act
+ let tasks = TaskCache::merge_tasks(a, b, 6);
+
+ // Assert
+ assert_eq!(tasks.len(), 6);
+ assert_eq!(tasks[0].starttime, 40);
+ assert_eq!(tasks[1].starttime, 30);
+ assert_eq!(tasks[2].starttime, 25);
+ assert_eq!(tasks[3].starttime, 20);
+ assert_eq!(tasks[4].starttime, 15);
+ assert_eq!(tasks[5].starttime, 10);
+
+ Ok(())
+ }
}
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel