From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 7/8] test: vzdump: add tests for mailto
Date: Mon, 15 Feb 2021 13:25:01 +0100 [thread overview]
Message-ID: <20210215122502.23854-8-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210215122502.23854-1-f.ebner@proxmox.com>
Re-use the existing code, by allowing special kinds of 'tests' that just set
the options that are tested for.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
No changes from v1.
Dependency bump for pve-guest-common is needed.
test/vzdump_new_retention_test.pl | 174 +++++++++++++++++++++++++++++-
1 file changed, 172 insertions(+), 2 deletions(-)
diff --git a/test/vzdump_new_retention_test.pl b/test/vzdump_new_retention_test.pl
index 569419fb..a8f70d62 100755
--- a/test/vzdump_new_retention_test.pl
+++ b/test/vzdump_new_retention_test.pl
@@ -73,7 +73,7 @@ $pve_tools_module->mock(
},
);
-my @tested_options = qw(prune-backups remove);
+my $tested_options;
# each test consists of the following:
# name - unique name for the test
@@ -81,7 +81,13 @@ my @tested_options = qw(prune-backups remove);
# storage_param - parameters for the mocked storage configuration
# vzdump_param - parameters for the mocked /etc/vzdump.conf
# expected - expected options
+#
+# To begin testing for different options, use a fake test like the first one
my @tests = (
+ {
+ description => 'BEGIN RETENTION TESTS',
+ tested_options => ['prune-backups', 'remove'],
+ },
{
description => 'no params',
expected => {
@@ -464,11 +470,174 @@ my @tests = (
remove => 0,
},
},
+ {
+ description => 'BEGIN MAILTO TESTS',
+ tested_options => ['mailto'],
+ },
+ {
+ description => 'mailto vzdump 1',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto vzdump 2',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto vzdump 3',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com,admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto vzdump 4',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com, admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto vzdump 5',
+ vzdump_param => {
+ 'mailto' => ' ,,; developer@proxmox.com, ; admin@proxmox.com ',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto vzdump 6',
+ vzdump_param => {
+ 'mailto' => '',
+ },
+ expected => {
+ 'mailto' => [],
+ },
+ },
+ {
+ description => 'mailto CLI 1',
+ cli_param => {
+ 'mailto' => 'developer@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto CLI 2',
+ cli_param => {
+ 'mailto' => 'developer@proxmox.com admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto CLI 3',
+ cli_param => {
+ 'mailto' => 'developer@proxmox.com,admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto CLI 4',
+ cli_param => {
+ 'mailto' => 'developer@proxmox.com, admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto CLI 5',
+ cli_param => {
+ 'mailto' => ' ,,; developer@proxmox.com, ; admin@proxmox.com ',
+ },
+ expected => {
+ 'mailto' => [
+ 'developer@proxmox.com',
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto both 1',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com',
+ },
+ cli_param => {
+ 'mailto' => 'admin@proxmox.com',
+ },
+ expected => {
+ 'mailto' => [
+ 'admin@proxmox.com',
+ ],
+ },
+ },
+ {
+ description => 'mailto both 2',
+ vzdump_param => {
+ 'mailto' => 'developer@proxmox.com',
+ },
+ cli_param => {
+ 'mailto' => '',
+ },
+ expected => {
+ 'mailto' => [],
+ },
+ },
);
plan tests => scalar @tests;
foreach my $test (@tests) {
+ if (defined($test->{tested_options})) {
+ $tested_options = $test->{tested_options};
+ ok(1, $test->{description});
+ next;
+ }
+
prepare_storage_config($test->{storage_param});
prepare_vzdump_config($test->{vzdump_param});
@@ -477,6 +646,7 @@ foreach my $test (@tests) {
my $got = eval {
PVE::VZDump::verify_vzdump_parameters($test->{cli_param}, 1);
+ PVE::VZDump::parse_mailto_exclude_path($test->{cli_param});
my $vzdump = PVE::VZDump->new('fake cmdline', $test->{cli_param}, undef);
@@ -484,7 +654,7 @@ foreach my $test (@tests) {
die "maxfiles is defined" if defined($opts->{maxfiles});
my $res = {};
- foreach my $opt (@tested_options) {
+ foreach my $opt (@{$tested_options}) {
next if !defined($opts->{$opt});
$res->{$opt} = $opts->{$opt};
}
--
2.20.1
next prev parent reply other threads:[~2021-02-15 12:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 12:24 [pve-devel] [PATCH-SERIES v2] loosen up mailto regex for backwards compatibility Fabian Ebner
2021-02-15 12:24 ` [pve-devel] [PATCH v2 common 1/8] sendmail: use more complete email regex and shellquote Fabian Ebner
2021-02-18 11:54 ` [pve-devel] applied: " Thomas Lamprecht
2021-02-15 12:24 ` [pve-devel] [PATCH v2 common 2/8] register email-or-username format Fabian Ebner
2021-02-18 11:54 ` [pve-devel] applied: " Thomas Lamprecht
2021-02-15 12:24 ` [pve-devel] [PATCH v2 guest-common 3/8] vzdump: command line: refactor handling prune-backups Fabian Ebner
2021-02-15 12:24 ` [pve-devel] [PATCH v2 guest-common 4/8] vzdump: command line: make sure mailto is comma-separated Fabian Ebner
2021-02-15 12:24 ` [pve-devel] [PATCH v2 guest-common 5/8] vzdump: mailto: use email-or-username-list format Fabian Ebner
2021-02-15 12:25 ` [pve-devel] [PATCH v2 manager 6/8] vzdump: refactor parsing mailto so it can be mocked Fabian Ebner
2021-02-15 12:25 ` Fabian Ebner [this message]
2021-02-15 12:25 ` [pve-devel] [PATCH v2 manager 8/8] test: vzdump: rename vzdump_new_retention_test.pl to vzdump_new_test.pl Fabian Ebner
2021-02-17 9:52 ` [pve-devel] [PATCH-SERIES v2] loosen up mailto regex for backwards compatibility Dominik Csapak
2021-02-17 10:35 ` Fabian Ebner
2021-02-17 11:42 ` Fabian Ebner
2021-02-19 15:36 ` [pve-devel] applied: " 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=20210215122502.23854-8-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