From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 1ED1B9CF34
for <pve-devel@lists.proxmox.com>; Fri, 2 Jun 2023 10:49:00 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C8E2F27482
for <pve-devel@lists.proxmox.com>; Fri, 2 Jun 2023 10:48:29 +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 <pve-devel@lists.proxmox.com>; Fri, 2 Jun 2023 10:48:28 +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 D5EE548316
for <pve-devel@lists.proxmox.com>; Fri, 2 Jun 2023 10:48:27 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 2 Jun 2023 10:48:24 +0200
Message-Id: <20230602084824.54967-5-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230602084824.54967-1-f.ebner@proxmox.com>
References: <20230602084824.54967-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.048 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: [pve-devel] [PATCH v2 proxmox 5/5] apt: tests: add tests for Ceph
Quincy repository detection on Bookworm
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2023 08:49:00 -0000
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
No changes in v2.
proxmox-apt/tests/repositories.rs | 30 +++++++++++++++++++
.../ceph-quincy-bookworm.list | 6 ++++
.../ceph-quincy-nosub-bookworm.list | 2 ++
.../sources.list.d/ceph-quincy-bookworm.list | 4 +++
.../ceph-quincy-nosub-bookworm.list | 2 ++
5 files changed, 44 insertions(+)
create mode 100644 proxmox-apt/tests/sources.list.d.expected/ceph-quincy-bookworm.list
create mode 100644 proxmox-apt/tests/sources.list.d.expected/ceph-quincy-nosub-bookworm.list
create mode 100644 proxmox-apt/tests/sources.list.d/ceph-quincy-bookworm.list
create mode 100644 proxmox-apt/tests/sources.list.d/ceph-quincy-nosub-bookworm.list
diff --git a/proxmox-apt/tests/repositories.rs b/proxmox-apt/tests/repositories.rs
index 2fb7ac8..be6aaff 100644
--- a/proxmox-apt/tests/repositories.rs
+++ b/proxmox-apt/tests/repositories.rs
@@ -397,6 +397,36 @@ fn test_standard_repositories() -> Result<(), Error> {
assert_eq!(std_repos, expected);
+ let pve_alt_list = read_dir.join("ceph-quincy-bookworm.list");
+ let mut file = APTRepositoryFile::new(&pve_alt_list)?.unwrap();
+ file.parse()?;
+
+ expected[0].status = None;
+ expected[1].status = None;
+ expected[2].status = None;
+ expected[3].status = Some(true);
+ expected[4].status = Some(true);
+ expected[5].status = Some(true);
+
+ let std_repos = standard_repositories(&[file], "pve", DebianCodename::Bookworm);
+
+ assert_eq!(std_repos, expected);
+
+ let pve_alt_list = read_dir.join("ceph-quincy-nosub-bookworm.list");
+ let mut file = APTRepositoryFile::new(&pve_alt_list)?.unwrap();
+ file.parse()?;
+
+ expected[0].status = None;
+ expected[1].status = None;
+ expected[2].status = None;
+ expected[3].status = None;
+ expected[4].status = Some(true);
+ expected[5].status = None;
+
+ let std_repos = standard_repositories(&[file], "pve", DebianCodename::Bookworm);
+
+ assert_eq!(std_repos, expected);
+
Ok(())
}
diff --git a/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-bookworm.list b/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-bookworm.list
new file mode 100644
index 0000000..9095e27
--- /dev/null
+++ b/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-bookworm.list
@@ -0,0 +1,6 @@
+deb https://enterprise.proxmox.com/debian/ceph-quincy bookworm enterprise
+
+deb http://download.proxmox.com/debian/ceph-quincy bookworm main
+
+deb http://download.proxmox.com/debian/ceph-quincy bookworm test
+
diff --git a/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-nosub-bookworm.list b/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-nosub-bookworm.list
new file mode 100644
index 0000000..b60fa98
--- /dev/null
+++ b/proxmox-apt/tests/sources.list.d.expected/ceph-quincy-nosub-bookworm.list
@@ -0,0 +1,2 @@
+deb http://download.proxmox.com/debian/ceph-quincy bookworm no-subscription
+
diff --git a/proxmox-apt/tests/sources.list.d/ceph-quincy-bookworm.list b/proxmox-apt/tests/sources.list.d/ceph-quincy-bookworm.list
new file mode 100644
index 0000000..fde8eba
--- /dev/null
+++ b/proxmox-apt/tests/sources.list.d/ceph-quincy-bookworm.list
@@ -0,0 +1,4 @@
+deb https://enterprise.proxmox.com/debian/ceph-quincy bookworm enterprise
+deb http://download.proxmox.com/debian/ceph-quincy bookworm main
+deb http://download.proxmox.com/debian/ceph-quincy bookworm test
+
diff --git a/proxmox-apt/tests/sources.list.d/ceph-quincy-nosub-bookworm.list b/proxmox-apt/tests/sources.list.d/ceph-quincy-nosub-bookworm.list
new file mode 100644
index 0000000..b60fa98
--- /dev/null
+++ b/proxmox-apt/tests/sources.list.d/ceph-quincy-nosub-bookworm.list
@@ -0,0 +1,2 @@
+deb http://download.proxmox.com/debian/ceph-quincy bookworm no-subscription
+
--
2.39.2