With the upcoming changes in how we send notifications, this one
really becomes pretty annoying to keep working. The location where
templates are looked up are defined in the proxmox_notify crate, so
there is no easy way to mock this for testing.
The test itself seemed not super valuable, mainly testing if
the backup logs are shortened if they ware too long - so they are just
removed.
Signed-off-by: Lukas Wagner <l.wag...@proxmox.com>
Reviewed-by: Fiona Ebner <f.eb...@proxmox.com>
---
test/Makefile | 6 +-
test/vzdump_notification_test.pl | 101 -------------------------------
2 files changed, 1 insertion(+), 106 deletions(-)
delete mode 100755 test/vzdump_notification_test.pl
diff --git a/test/Makefile b/test/Makefile
index 62d75050..743804c8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,7 +5,7 @@ all:
export PERLLIB=..
.PHONY: check
-check: test-replication test-balloon test-vzdump-notification test-vzdump
test-osd
+check: test-replication test-balloon test-vzdump test-osd
.PHONY: test-balloon
test-balloon:
@@ -17,10 +17,6 @@ test-replication: replication1.t replication2.t
replication3.t replication4.t re
replication%.t: replication_test%.pl
./$<
-.PHONY: test-vzdump-notification
-test-vzdump-notification:
- ./vzdump_notification_test.pl
-
.PHONY: test-vzdump
test-vzdump: test-vzdump-guest-included test-vzdump-new
diff --git a/test/vzdump_notification_test.pl b/test/vzdump_notification_test.pl
deleted file mode 100755
index 631606bb..00000000
--- a/test/vzdump_notification_test.pl
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use lib '..';
-
-use Test::More tests => 3;
-use Test::MockModule;
-
-use PVE::VZDump;
-
-my $STATUS = qr/.*status.*/;
-my $NO_LOGFILE = qr/.*Could not open log file.*/;
-my $LOG_TOO_LONG = qr/.*Log output was too long.*/;
-my $TEST_FILE_PATH = '/tmp/mail_test';
-my $TEST_FILE_WRONG_PATH = '/tmp/mail_test_wrong';
-
-sub prepare_mail_with_status {
- open(TEST_FILE, '>', $TEST_FILE_PATH); # Removes previous content
- print TEST_FILE "start of log file\n";
- print TEST_FILE "status: 0\% this should not be in the mail\n";
- print TEST_FILE "status: 55\% this should not be in the mail\n";
- print TEST_FILE "status: 100\% this should not be in the mail\n";
- print TEST_FILE "end of log file\n";
- close(TEST_FILE);
-}
-
-sub prepare_long_mail {
- open(TEST_FILE, '>', $TEST_FILE_PATH); # Removes previous content
- # 0.5 MB * 2 parts + the overview tables gives more than 1 MB mail
- print TEST_FILE "a" x (1024*1024);
- close(TEST_FILE);
-}
-
-my $result_text;
-my $result_properties;
-
-my $mock_notification_module = Test::MockModule->new('PVE::Notify');
-my $mocked_notify = sub {
- my ($severity, $title, $text, $properties, $metadata) = @_;
-
- $result_text = $text;
- $result_properties = $properties;
-};
-my $mocked_notify_short = sub {
- my (@params) = @_;
- return $mocked_notify->('<some severity>', @params);
-};
-
-$mock_notification_module->mock(
- 'notify' => $mocked_notify,
- 'info' => $mocked_notify_short,
- 'notice' => $mocked_notify_short,
- 'warning' => $mocked_notify_short,
- 'error' => $mocked_notify_short,
-);
-$mock_notification_module->mock('cfs_read_file', sub {
- my $path = shift;
-
- if ($path eq 'datacenter.cfg') {
- return {};
- } elsif ($path eq 'notifications.cfg' || $path eq
'priv/notifications.cfg') {
- return '';
- } else {
- die "unexpected cfs_read_file\n";
- }
-});
-
-my $MAILTO = ['test_addr...@proxmox.com'];
-my $SELF = {
- opts => { mailto => $MAILTO },
- cmdline => 'test_command_on_cli',
-};
-
-my $task = { state => 'ok', vmid => '100', };
-my $tasklist;
-sub prepare_test {
- $result_text = undef;
- $task->{tmplog} = shift;
- $tasklist = [ $task ];
-}
-
-{
- prepare_test($TEST_FILE_WRONG_PATH);
- PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef);
- like($result_properties->{logs}, $NO_LOGFILE, "Missing logfile is
detected");
-}
-{
- prepare_test($TEST_FILE_PATH);
- prepare_mail_with_status();
- PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef);
- unlike($result_properties->{"status-text"}, $STATUS, "Status are not in
text part of mails");
-}
-{
- prepare_test($TEST_FILE_PATH);
- prepare_long_mail();
- PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef);
- like($result_properties->{logs}, $LOG_TOO_LONG, "Text part of mails gets
shortened");
-}
-unlink $TEST_FILE_PATH;
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
