From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox 5/5] apt: tests: add tests for Ceph Quincy repository detection on Bookworm
Date: Fri, 2 Jun 2023 10:48:24 +0200 [thread overview]
Message-ID: <20230602084824.54967-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230602084824.54967-1-f.ebner@proxmox.com>
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
next prev parent reply other threads:[~2023-06-02 8:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 8:48 [pve-devel] [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 2/5] apt: split Ceph main repository into no-subscription and enterprise Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 3/5] apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 4/5] apt: tests: code cleanup to avoid useless vector Fiona Ebner
2023-06-02 8:48 ` Fiona Ebner [this message]
2023-06-04 16:54 ` [pve-devel] applied: [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230602084824.54967-5-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox